Fixed (ICE-5740) - IcePatch2 has issues with 'large' files.

9 files changed, 267 insertions, 305 deletions

diff --git a/cpp/src/IceGrid/.depend.mak b/cpp/src/IceGrid/.depend.mak
index f3352d53bc6..f3a66153016 100755
--- a/cpp/src/IceGrid/.depend.mak
+++ b/cpp/src/IceGrid/.depend.mak
@@ -513,7 +513,7 @@ DescriptorParser.obj: \
     "$(includedir)\Ice\Metrics.h" \
     "$(includedir)\Ice\Service.h" \
     "..\..\src\IceXML\Parser.h" \
-    "$(includedir)\IcePatch2\Util.h" \
+    "..\..\src\IcePatch2Lib\Util.h" \
     "$(includedir)\IcePatch2\FileInfo.h" \
     "$(includedir)\IcePatch2\Config.h" \
     "$(includedir)\IceGrid\Admin.h" \
@@ -620,132 +620,6 @@ FileParserI.obj: \
     "$(includedir)\Ice\FacetMap.h" \
     "$(includedir)\Ice\Endpoint.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)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\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\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\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\Service.h" \
-    "Parser.h" \
-    "$(includedir)\IceGrid\Admin.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\Query.h" \
-
 Parser.obj: \
 	Parser.cpp \
     "$(includedir)\IceUtil\DisableWarnings.h" \
@@ -894,13 +768,12 @@ Parser.obj: \
     "$(includedir)\IceBox\IceBox.h" \
     "$(includedir)\IceBox\Config.h" \
 
-Scanner.obj: \
-	Scanner.cpp \
-    "$(includedir)\IceUtil\ScannerConfig.h" \
-    "$(includedir)\IceUtil\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" \
@@ -1010,28 +883,30 @@ Scanner.obj: \
     "$(includedir)\Ice\NativePropertiesAdmin.h" \
     "$(includedir)\Ice\Metrics.h" \
     "$(includedir)\Ice\Service.h" \
-    "Parser.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" \
-    "$(includedir)\IceGrid\Exception.h" \
-    "$(includedir)\IceGrid\Config.h" \
-    "$(includedir)\IceGrid\Descriptor.h" \
-    "$(includedir)\IceGrid\Query.h" \
-    "Grammar.h" \
+    "$(includedir)\IceUtil\Random.h" \
+    "Internal.h" \
+    "$(includedir)\IceGrid\Observer.h" \
+    "$(includedir)\IceGrid\Registry.h" \
+    "$(includedir)\IceGrid\Session.h" \
 
-Util.obj: \
-	Util.cpp \
-    "$(includedir)\Ice\Ice.h" \
+Internal.obj: \
+	Internal.cpp \
+    "Internal.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\Config.h" \
+    "$(includedir)\Ice\Config.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\IceUtil\Exception.h" \
@@ -1045,34 +920,27 @@ Util.obj: \
     "$(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)\Ice\Proxy.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)\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\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" \
@@ -1082,6 +950,7 @@ Util.obj: \
     "$(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" \
@@ -1091,10 +960,6 @@ Util.obj: \
     "$(includedir)\Ice\SlicedDataF.h" \
     "$(includedir)\Ice\UserExceptionFactory.h" \
     "$(includedir)\Ice\FactoryTable.h" \
-    "$(includedir)\Ice\InstrumentationF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
     "$(includedir)\Ice\Incoming.h" \
@@ -1102,63 +967,37 @@ Util.obj: \
     "$(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\BuiltinSequences.h" \
     "$(includedir)\Ice\ProcessF.h" \
-    "$(includedir)\Ice\Router.h" \
-    "$(includedir)\Ice\DispatchInterceptor.h" \
-    "$(includedir)\Ice\NativePropertiesAdmin.h" \
-    "$(includedir)\Ice\Metrics.h" \
-    "$(includedir)\Ice\Service.h" \
-    "$(includedir)\IcePatch2\Util.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IcePatch2\Config.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)\Ice\Locator.h" \
+    "$(includedir)\Ice\Properties.h" \
+    "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Glacier2\Config.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "Internal.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" \
 
-Internal.obj: \
-	Internal.cpp \
-    "Internal.h" \
+IceLocatorDiscovery.obj: \
+	IceLocatorDiscovery.cpp \
+    "IceLocatorDiscovery.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\IceUtil\Shared.h" \
@@ -1227,39 +1066,28 @@ Internal.obj: \
     "$(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\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\SlicedData.h" \
     "$(includedir)\Ice\SliceChecksums.h" \
+    "$(includedir)\Ice\SliceChecksumDict.h" \
 
-IceLocatorDiscovery.obj: \
-	IceLocatorDiscovery.cpp \
-    "IceLocatorDiscovery.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\Config.h" \
-    "$(includedir)\Ice\Config.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\IceUtil\Exception.h" \
@@ -1273,27 +1101,34 @@ IceLocatorDiscovery.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\Ice\Proxy.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)\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\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" \
@@ -1303,7 +1138,6 @@ IceLocatorDiscovery.obj: \
     "$(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" \
@@ -1313,6 +1147,10 @@ IceLocatorDiscovery.obj: \
     "$(includedir)\Ice\SlicedDataF.h" \
     "$(includedir)\Ice\UserExceptionFactory.h" \
     "$(includedir)\Ice\FactoryTable.h" \
+    "$(includedir)\Ice\InstrumentationF.h" \
+    "$(includedir)\Ice\Dispatcher.h" \
+    "$(includedir)\Ice\LocalException.h" \
+    "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
     "$(includedir)\Ice\Incoming.h" \
@@ -1320,20 +1158,179 @@ IceLocatorDiscovery.obj: \
     "$(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\LocalException.h" \
+    "$(includedir)\Ice\Router.h" \
+    "$(includedir)\Ice\DispatchInterceptor.h" \
+    "$(includedir)\Ice\NativePropertiesAdmin.h" \
+    "$(includedir)\Ice\Metrics.h" \
+    "$(includedir)\Ice\Service.h" \
+    "Parser.h" \
+    "$(includedir)\IceGrid\Admin.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\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)\Ice\ProxyHandle.h" \
+    "$(includedir)\IceUtil\Handle.h" \
+    "$(includedir)\IceUtil\Exception.h" \
+    "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\Exception.h" \
+    "$(includedir)\Ice\Format.h" \
+    "$(includedir)\Ice\StreamF.h" \
+    "$(includedir)\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\Outgoing.h" \
-    "$(includedir)\Ice\OutgoingAsync.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\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\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\SliceChecksums.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\Service.h" \
+    "Parser.h" \
+    "$(includedir)\IceGrid\Admin.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\Query.h" \
+    "Grammar.h" \
 
 AdminRouter.obj: \
 	AdminRouter.cpp \
@@ -1642,36 +1639,6 @@ PlatformInfo.obj: \
     "$(includedir)\IceGrid\Registry.h" \
     "$(includedir)\IceGrid\Session.h" \
     "TraceLevels.h" \
-    "$(includedir)\IcePatch2\Util.h" \
-    "$(includedir)\Ice\Ice.h" \
-    "$(includedir)\Ice\DeprecatedStringConverter.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
-    "$(includedir)\Ice\Dispatcher.h" \
-    "$(includedir)\Ice\RemoteLogger.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\Service.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IcePatch2\Config.h" \
 
 SessionManager.obj: \
 	SessionManager.cpp \
@@ -2020,7 +1987,7 @@ Activator.obj: \
     "$(includedir)\IceUtil\Random.h" \
     "ServerI.h" \
     "$(includedir)\Freeze\EvictorF.h" \
-    "$(includedir)\IcePatch2\Util.h" \
+    "..\..\src\IcePatch2Lib\Util.h" \
     "$(includedir)\IcePatch2\FileInfo.h" \
     "$(includedir)\IcePatch2\Config.h" \
 
@@ -2281,7 +2248,7 @@ NodeI.obj: \
     "$(includedir)\Ice\NativePropertiesAdmin.h" \
     "$(includedir)\Ice\Metrics.h" \
     "$(includedir)\Ice\Service.h" \
-    "$(includedir)\IcePatch2\Util.h" \
+    "..\..\src\IcePatch2Lib\Util.h" \
     "$(includedir)\IcePatch2\FileInfo.h" \
     "$(includedir)\IcePatch2\Config.h" \
     "$(includedir)\IcePatch2\ClientUtil.h" \
@@ -2740,7 +2707,7 @@ ServerI.obj: \
     "DescriptorHelper.h" \
     "$(includedir)\IceUtil\OutputUtil.h" \
     "..\..\src\IceXML\Parser.h" \
-    "$(includedir)\IcePatch2\Util.h" \
+    "..\..\src\IcePatch2Lib\Util.h" \
 
 AdapterCache.obj: \
 	AdapterCache.cpp \
@@ -4765,9 +4732,6 @@ NodeCache.obj: \
     "DescriptorHelper.h" \
     "$(includedir)\IceUtil\OutputUtil.h" \
     "..\..\src\IceXML\Parser.h" \
-    "$(includedir)\IcePatch2\Util.h" \
-    "$(includedir)\IcePatch2\FileInfo.h" \
-    "$(includedir)\IcePatch2\Config.h" \
 
 NodeSessionI.obj: \
 	NodeSessionI.cpp \
@@ -7704,7 +7668,7 @@ IceGridNode.obj: \
     "DescriptorParser.h" \
     "Util.h" \
     "$(includedir)\IceUtil\Random.h" \
-    "$(includedir)\IcePatch2\Util.h" \
+    "..\..\src\IcePatch2Lib\Util.h" \
 
 IceGridRegistry.obj: \
 	IceGridRegistry.cpp \
diff --git a/cpp/src/IceGrid/Activator.cpp b/cpp/src/IceGrid/Activator.cpp
index c1356f98c91..a7969d6fad9 100644
--- a/cpp/src/IceGrid/Activator.cpp
+++ b/cpp/src/IceGrid/Activator.cpp
@@ -18,7 +18,7 @@
 #include <IceGrid/Util.h>
 #include <IceGrid/ServerI.h>
 
-#include <IcePatch2/Util.h>
+#include <IcePatch2Lib/Util.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -365,7 +365,7 @@ Activator::activate(const string& name,
         throw string("The server executable path is empty.");
     }
 
-    string pwd = IcePatch2::simplify(pwdPath);
+    string pwd = IcePatch2Internal::simplify(pwdPath);
 #ifdef _WIN32
     if(!IceUtilInternal::isAbsolutePath(path))
     {
diff --git a/cpp/src/IceGrid/DescriptorParser.cpp b/cpp/src/IceGrid/DescriptorParser.cpp
index 0215ff266bd..d589b729ee8 100644
--- a/cpp/src/IceGrid/DescriptorParser.cpp
+++ b/cpp/src/IceGrid/DescriptorParser.cpp
@@ -9,7 +9,7 @@
 
 #include <Ice/Ice.h>
 #include <IceXML/Parser.h>
-#include <IcePatch2/Util.h>
+#include <IcePatch2Lib/Util.h>
 #include <IceGrid/Admin.h>
 #include <IceGrid/DescriptorParser.h>
 #include <IceGrid/DescriptorBuilder.h>
@@ -870,7 +870,7 @@ DescriptorParser::parseDescriptor(const string& descriptor,
                                   const Ice::CommunicatorPtr& communicator,
                                   const IceGrid::AdminPrx& admin)
 {
-    string filename = IcePatch2::simplify(descriptor);
+    string filename = IcePatch2Internal::simplify(descriptor);
     DescriptorHandler handler(filename, communicator);
     handler.setAdmin(admin);
     handler.setVariables(variables, targets);
@@ -881,7 +881,7 @@ DescriptorParser::parseDescriptor(const string& descriptor,
 ApplicationDescriptor
 DescriptorParser::parseDescriptor(const string& descriptor, const Ice::CommunicatorPtr& communicator)
 {
-    string filename = IcePatch2::simplify(descriptor);
+    string filename = IcePatch2Internal::simplify(descriptor);
     DescriptorHandler handler(filename, communicator);
     IceXML::Parser::parse(filename, handler);
     return handler.getApplicationDescriptor();
diff --git a/cpp/src/IceGrid/IceGridNode.cpp b/cpp/src/IceGrid/IceGridNode.cpp
index 918aef6a097..1fd8142a089 100644
--- a/cpp/src/IceGrid/IceGridNode.cpp
+++ b/cpp/src/IceGrid/IceGridNode.cpp
@@ -23,7 +23,7 @@
 #include <IceGrid/TraceLevels.h>
 #include <IceGrid/DescriptorParser.h>
 #include <IceGrid/Util.h>
-#include <IcePatch2/Util.h>
+#include <IcePatch2Lib/Util.h>
 
 #ifdef _WIN32
 #   include <direct.h>
@@ -363,9 +363,9 @@ NodeService::startImpl(int argc, char* argv[], int& status)
             dataPath += "/"; 
         }
 
-        IcePatch2::createDirectory(dataPath + "servers");
-        IcePatch2::createDirectory(dataPath + "tmp");
-        IcePatch2::createDirectory(dataPath + "distrib");
+        IcePatch2Internal::createDirectory(dataPath + "servers");
+        IcePatch2Internal::createDirectory(dataPath + "tmp");
+        IcePatch2Internal::createDirectory(dataPath + "distrib");
 
 #ifdef _WIN32
         //
diff --git a/cpp/src/IceGrid/NodeCache.cpp b/cpp/src/IceGrid/NodeCache.cpp
index 8c29af2aa43..e28468b36af 100644
--- a/cpp/src/IceGrid/NodeCache.cpp
+++ b/cpp/src/IceGrid/NodeCache.cpp
@@ -18,8 +18,6 @@
 #include <IceGrid/ReplicaCache.h>
 #include <IceGrid/DescriptorHelper.h>
 
-#include <IcePatch2/Util.h>
-
 using namespace std;
 using namespace IceGrid;
 
diff --git a/cpp/src/IceGrid/NodeI.cpp b/cpp/src/IceGrid/NodeI.cpp
index 78497aacfc6..2f1281c9286 100644
--- a/cpp/src/IceGrid/NodeI.cpp
+++ b/cpp/src/IceGrid/NodeI.cpp
@@ -10,7 +10,7 @@
 #include <IceUtil/Timer.h>
 #include <IceUtil/FileUtil.h>
 #include <Ice/Ice.h>
-#include <IcePatch2/Util.h>
+#include <IcePatch2Lib/Util.h>
 #include <IcePatch2/ClientUtil.h>
 #include <IceGrid/NodeI.h>
 #include <IceGrid/Activator.h>
@@ -22,6 +22,7 @@
 
 using namespace std;
 using namespace IcePatch2;
+using namespace IcePatch2Internal;
 using namespace IceGrid;
 
 namespace
@@ -1075,7 +1076,7 @@ NodeI::removeServer(const ServerIPtr& server, const std::string& application)
             {
                 try
                 {
-                    IcePatch2::removeRecursive(appDir);
+                    IcePatch2Internal::removeRecursive(appDir);
                 }
                 catch(const string& msg)
                 {
@@ -1260,8 +1261,8 @@ void
 NodeI::patch(const FileServerPrx& icepatch, const string& dest, const vector<string>& directories)
 {
     IcePatch2::PatcherFeedbackPtr feedback = new LogPatcherFeedback(_traceLevels, dest);
-    IcePatch2::createDirectory(_dataDir + "/" + dest);
-    PatcherPtr patcher = new Patcher(icepatch, feedback, _dataDir + "/" + dest, false, 100, 1);
+    IcePatch2Internal::createDirectory(_dataDir + "/" + dest);
+    PatcherPtr patcher = PatcherFactory::create(icepatch, feedback, _dataDir + "/" + dest, false, 100, 1);
     bool aborted = !patcher->prepare();
     if(!aborted)
     {
diff --git a/cpp/src/IceGrid/PlatformInfo.cpp b/cpp/src/IceGrid/PlatformInfo.cpp
index bb36fdf8991..1835edaa991 100644
--- a/cpp/src/IceGrid/PlatformInfo.cpp
+++ b/cpp/src/IceGrid/PlatformInfo.cpp
@@ -17,7 +17,7 @@
 #include <IceGrid/PlatformInfo.h>
 #include <IceGrid/TraceLevels.h>
 
-#include <IcePatch2/Util.h>
+#include <set>
 #include <climits>
 
 #if defined(_WIN32)
diff --git a/cpp/src/IceGrid/ServerI.cpp b/cpp/src/IceGrid/ServerI.cpp
index 2fb917d9190..34f0030d790 100644
--- a/cpp/src/IceGrid/ServerI.cpp
+++ b/cpp/src/IceGrid/ServerI.cpp
@@ -18,7 +18,7 @@
 #include <IceGrid/ServerAdapterI.h>
 #include <IceGrid/DescriptorHelper.h>
 
-#include <IcePatch2/Util.h>
+#include <IcePatch2Lib/Util.h>
 #include <IceUtil/FileUtil.h>
 
 #include <sys/types.h>
@@ -1889,7 +1889,7 @@ ServerI::destroy()
     {
         try
         {
-            IcePatch2::removeRecursive(_serverDir);
+            IcePatch2Internal::removeRecursive(_serverDir);
         }
         catch(const string& msg)
         {
@@ -2049,7 +2049,7 @@ ServerI::update()
                 //
                 try
                 {
-                    IcePatch2::removeRecursive(_serverDir);
+                    IcePatch2Internal::removeRecursive(_serverDir);
                 }
                 catch(const string&)
                 {
@@ -2270,7 +2270,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
     //
     for(Ice::StringSeq::const_iterator p = _desc->logs.begin(); p != _desc->logs.end(); ++p)
     {
-        string path = IcePatch2::simplify(*p);
+        string path = IcePatch2Internal::simplify(*p);
         if(IceUtilInternal::isAbsolutePath(path))
         {
             _logs.push_back(path);
@@ -2348,7 +2348,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
         //
         // Remove old configuration files.
         //
-        Ice::StringSeq files = IcePatch2::readDirectory(_serverDir + "/config");
+        Ice::StringSeq files = IcePatch2Internal::readDirectory(_serverDir + "/config");
         Ice::StringSeq toDel;
         set_difference(files.begin(), files.end(), knownFiles.begin(), knownFiles.end(), back_inserter(toDel));
         for(Ice::StringSeq::const_iterator q = toDel.begin(); q != toDel.end(); ++q)
@@ -2357,7 +2357,7 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
             {
                 try
                 {
-                    IcePatch2::remove(_serverDir + "/config/" + *q);
+                    IcePatch2Internal::remove(_serverDir + "/config/" + *q);
                 }
                 catch(const string& msg)
                 {
@@ -2412,14 +2412,14 @@ ServerI::updateImpl(const InternalServerDescriptorPtr& descriptor)
         //
         // Remove old database environments.
         //
-        Ice::StringSeq dbEnvs = IcePatch2::readDirectory(_serverDir + "/dbs");
+        Ice::StringSeq dbEnvs = IcePatch2Internal::readDirectory(_serverDir + "/dbs");
         Ice::StringSeq toDel;
         set_difference(dbEnvs.begin(), dbEnvs.end(), knownDbEnvs.begin(), knownDbEnvs.end(), back_inserter(toDel));
         for(Ice::StringSeq::const_iterator p = toDel.begin(); p != toDel.end(); ++p)
         {
             try
             {
-                IcePatch2::removeRecursive(_serverDir + "/dbs/" + *p);
+                IcePatch2Internal::removeRecursive(_serverDir + "/dbs/" + *p);
             }
             catch(const string& msg)
             {
@@ -3047,7 +3047,7 @@ ServerI::createOrUpdateDirectory(const string& dir)
 {
     try
     {
-        IcePatch2::createDirectory(dir);
+        IcePatch2Internal::createDirectory(dir);
     }
     catch(const string&)
     {
@@ -3148,7 +3148,7 @@ ServerI::getFilePath(const string& filename) const
     }
     else if(!filename.empty() && filename[0] == '#')
     {
-        string path = IcePatch2::simplify(filename.substr(1));
+        string path = IcePatch2Internal::simplify(filename.substr(1));
         if(!IceUtilInternal::isAbsolutePath(path))
         {
             path = _node->getPlatformInfo().getCwd() + "/" + path;
diff --git a/cpp/src/IceGrid/Util.cpp b/cpp/src/IceGrid/Util.cpp
index 4ad7f08f0ca..8393edccbe4 100644
--- a/cpp/src/IceGrid/Util.cpp
+++ b/cpp/src/IceGrid/Util.cpp
@@ -8,7 +8,6 @@
 // **********************************************************************
 
 #include <Ice/Ice.h>
-#include <IcePatch2/Util.h>
 #include <IceGrid/Util.h>
 #include <IceGrid/Admin.h>
 #include <IceGrid/Internal.h>