Updated Windows dependencies

author: Dwayne Boone <dwayne@zeroc.com> 2015-11-10 12:18:27 -0330
committer: Dwayne Boone <dwayne@zeroc.com> 2015-11-10 12:18:27 -0330
commit: fcc8173b2404c0688e3921dd09d301878c3b960b (patch)
tree: a948189c7dc13aef10169873a31cf0a71b68e54a /cpp
parent: More changes to TesetUtil for Freeze tests (diff)
download: ice-fcc8173b2404c0688e3921dd09d301878c3b960b.tar.bz2
ice-fcc8173b2404c0688e3921dd09d301878c3b960b.tar.xz
ice-fcc8173b2404c0688e3921dd09d301878c3b960b.zip
18 files changed, 610 insertions, 103 deletions
diff --git a/cpp/src/Freeze/.depend.mak b/cpp/src/Freeze/.depend.mak
index 0f96c3f9385..bf0078b6b67 100755
--- a/cpp/src/Freeze/.depend.mak
+++ b/cpp/src/Freeze/.depend.mak
@@ -213,7 +213,7 @@ BackgroundSaveEvictorI.obj: \
     "TransactionI.h" \
     "EvictorIteratorI.h" \
     "SharedDbEnv.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
     "Util.h" \
 
@@ -609,7 +609,7 @@ ConnectionI.obj: \
     "SharedDbEnv.h" \
     "$(includedir)\Freeze\Map.h" \
     "$(includedir)\Freeze\Exception.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "MapI.h" \
 
 EvictorI.obj: \
@@ -762,7 +762,7 @@ EvictorI.obj: \
     "TransactionI.h" \
     "EvictorIteratorI.h" \
     "SharedDbEnv.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "Util.h" \
     "PingObject.h" \
 
@@ -916,7 +916,7 @@ EvictorIteratorI.obj: \
     "$(includedir)\IceUtil\RecMutex.h" \
     "$(includedir)\IceUtil\UUID.h" \
     "SharedDbEnv.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "Util.h" \
 
 Index.obj: \
@@ -1070,7 +1070,7 @@ Index.obj: \
     "TransactionI.h" \
     "EvictorIteratorI.h" \
     "SharedDbEnv.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
 
 IndexI.obj: \
 	IndexI.cpp \
@@ -1223,7 +1223,7 @@ IndexI.obj: \
     "TransactionI.h" \
     "EvictorIteratorI.h" \
     "SharedDbEnv.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "Util.h" \
 
 MapDb.obj: \
@@ -1360,7 +1360,7 @@ MapDb.obj: \
     "SharedDbEnv.h" \
     "$(includedir)\Freeze\Map.h" \
     "$(includedir)\Freeze\Exception.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "Util.h" \
     "$(includedir)\Freeze\Catalog.h" \
     "$(includedir)\Freeze\CatalogData.h" \
@@ -1500,7 +1500,7 @@ MapI.obj: \
     "$(includedir)\Freeze\Index.h" \
     "TransactionI.h" \
     "SharedDbEnv.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "MapDb.h" \
     "Util.h" \
     "$(includedir)\Freeze\TransactionHolder.h" \
@@ -1659,7 +1659,7 @@ ObjectStore.obj: \
     "$(includedir)\Freeze\CatalogData.h" \
     "EvictorIteratorI.h" \
     "SharedDbEnv.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "BackgroundSaveEvictorI.h" \
     "Util.h" \
     "IndexI.h" \
@@ -1791,7 +1791,7 @@ SharedDbEnv.obj: \
     "$(includedir)\Freeze\Exception.h" \
     "$(includedir)\Freeze\Connection.h" \
     "$(includedir)\Freeze\Transaction.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "Util.h" \
     "MapDb.h" \
     "ConnectionI.h" \
@@ -1974,7 +1974,7 @@ TransactionalEvictorContext.obj: \
     "TransactionI.h" \
     "EvictorIteratorI.h" \
     "SharedDbEnv.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "TransactionalEvictorI.h" \
     "Util.h" \
     "ConnectionI.h" \
@@ -2130,7 +2130,7 @@ TransactionalEvictorI.obj: \
     "TransactionI.h" \
     "EvictorIteratorI.h" \
     "SharedDbEnv.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "Util.h" \
     "TransactionalEvictorContext.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
@@ -2298,7 +2298,7 @@ TransactionI.obj: \
     "SharedDbEnv.h" \
     "$(includedir)\Freeze\Map.h" \
     "$(includedir)\Freeze\Exception.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
 
 Util.obj: \
 	Util.cpp \
diff --git a/cpp/src/FreezeScript/.depend.mak b/cpp/src/FreezeScript/.depend.mak
index 2a99698be24..60b7f82fb62 100755
--- a/cpp/src/FreezeScript/.depend.mak
+++ b/cpp/src/FreezeScript/.depend.mak
@@ -1471,7 +1471,7 @@ Transformer.obj: \
     "$(includedir)\Freeze\EvictorF.h" \
     "$(includedir)\Freeze\ConnectionF.h" \
     "$(includedir)\Freeze\Index.h" \
-    "..\..\src\IceXML\Parser.h" \
+    "$(includedir)\IceXML\Parser.h" \
     "$(includedir)\IceUtil\InputUtil.h" \
 
 transformdb.obj: \
@@ -1616,7 +1616,7 @@ transformdb.obj: \
     "$(includedir)\Freeze\Exception.h" \
     "$(includedir)\IceUtil\Options.h" \
     "$(includedir)\IceUtil\RecMutex.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
 
 DumpDescriptors.obj: \
 	DumpDescriptors.cpp \
@@ -1744,7 +1744,7 @@ DumpDescriptors.obj: \
     "$(includedir)\Ice\RegisterPlugins.h" \
     "$(includedir)\Slice\Parser.h" \
     "Error.h" \
-    "..\..\src\IceXML\Parser.h" \
+    "$(includedir)\IceXML\Parser.h" \
     "AssignVisitor.h" \
     "Print.h" \
     "Functions.h" \
@@ -1879,7 +1879,7 @@ DumpDB.obj: \
     "$(includedir)\Ice\RegisterPlugins.h" \
     "$(includedir)\Slice\Parser.h" \
     "Error.h" \
-    "..\..\src\IceXML\Parser.h" \
+    "$(includedir)\IceXML\Parser.h" \
     "Util.h" \
     "$(includedir)\Freeze\CatalogData.h" \
     "Exception.h" \
@@ -1893,4 +1893,4 @@ DumpDB.obj: \
     "$(includedir)\IceUtil\OutputUtil.h" \
     "$(includedir)\IceUtil\Options.h" \
     "$(includedir)\IceUtil\RecMutex.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
diff --git a/cpp/src/Glacier2/.depend.mak b/cpp/src/Glacier2/.depend.mak
index dbbebc99a67..ef62a1c8c41 100755
--- a/cpp/src/Glacier2/.depend.mak
+++ b/cpp/src/Glacier2/.depend.mak
@@ -526,7 +526,7 @@ Glacier2Router.obj: \
     "$(includedir)\IceUtil\Shared.h" \
     "$(includedir)\IceUtil\Atomic.h" \
     "$(includedir)\IceUtil\Handle.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\Ice\Service.h" \
     "$(includedir)\Ice\Ice.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak
index 04379acb469..14c358c1ed2 100755
--- a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak
@@ -130,6 +130,6 @@ CryptPermissionsVerifierI.obj: \
     "$(includedir)\Ice\SliceChecksumDict.h" \
     "$(includedir)\Ice\Service.h" \
     "$(includedir)\Ice\RegisterPlugins.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
     "$(includedir)\IceUtil\InputUtil.h" \
diff --git a/cpp/src/Ice/.depend.mak b/cpp/src/Ice/.depend.mak
index 729802a005d..2e7434e1645 100755
--- a/cpp/src/Ice/.depend.mak
+++ b/cpp/src/Ice/.depend.mak
@@ -503,7 +503,7 @@ Application.obj: \
     "$(includedir)\Ice\Service.h" \
     "$(includedir)\Ice\RegisterPlugins.h" \
     "LoggerI.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\CtrlCHandler.h" \
     "..\..\src\IceUtil\ArgVector.h" \
 
@@ -3009,7 +3009,7 @@ Initialize.obj: \
     "$(includedir)\Ice\Stream.h" \
     "LoggerI.h" \
     "$(includedir)\Ice\Logger.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "Instance.h" \
     "TraceLevelsF.h" \
     "DefaultsAndOverridesF.h" \
@@ -3185,7 +3185,7 @@ Instance.obj: \
     "$(includedir)\Ice\NativePropertiesAdmin.h" \
     "LoggerI.h" \
     "$(includedir)\Ice\Logger.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "NetworkProxy.h" \
     "EndpointFactoryManager.h" \
     "EndpointFactoryF.h" \
@@ -3704,7 +3704,7 @@ LoggerI.obj: \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -5339,7 +5339,7 @@ PropertiesI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\Ice\Initialize.h" \
     "$(includedir)\IceUtil\Timer.h" \
     "$(includedir)\IceUtil\Thread.h" \
@@ -6945,7 +6945,7 @@ Service.obj: \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
     "..\..\src\IceUtil\ArgVector.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Service.h" \
     "$(includedir)\Ice\Ice.h" \
diff --git a/cpp/src/IceDB/.depend.mak b/cpp/src/IceDB/.depend.mak
index 17a7ab482d8..ee379870c87 100644..100755
--- a/cpp/src/IceDB/.depend.mak
+++ b/cpp/src/IceDB/.depend.mak
@@ -4,12 +4,13 @@ IceDB.obj: \
     "IceDB.h" \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\Ice\Initialize.h" \
-    "$(includedir)\IceUtil\Timer.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\Shared.h" \
     "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
     "$(includedir)\IceUtil\Handle.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" \
diff --git a/cpp/src/IceGrid/.depend.mak b/cpp/src/IceGrid/.depend.mak
index 7b45a35e975..343e1fda9a0 100755
--- a/cpp/src/IceGrid/.depend.mak
+++ b/cpp/src/IceGrid/.depend.mak
@@ -23,6 +23,19 @@ IceLocatorDiscovery.h: \
     "$(slicedir)/Ice/Identity.ice" \
     "$(slicedir)/Ice/ProcessF.ice"
 
+DBTypes.h: \
+    DBTypes.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"
+
 Client.obj: \
 	Client.cpp \
     "$(includedir)\IceUtil\DisableWarnings.h" \
@@ -253,7 +266,7 @@ DescriptorBuilder.obj: \
     "$(includedir)\Ice\Plugin.h" \
     "$(includedir)\Ice\LocalException.h" \
     "DescriptorBuilder.h" \
-    "..\..\src\IceXML\Parser.h" \
+    "$(includedir)\IceXML\Parser.h" \
     "$(includedir)\IceGrid\Descriptor.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
@@ -392,7 +405,7 @@ DescriptorHelper.obj: \
     "$(includedir)\Ice\RegisterPlugins.h" \
     "DescriptorHelper.h" \
     "$(includedir)\IceUtil\OutputUtil.h" \
-    "..\..\src\IceXML\Parser.h" \
+    "$(includedir)\IceXML\Parser.h" \
     "$(includedir)\IceGrid\Admin.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
@@ -529,7 +542,7 @@ DescriptorParser.obj: \
     "$(includedir)\Ice\SliceChecksumDict.h" \
     "$(includedir)\Ice\Service.h" \
     "$(includedir)\Ice\RegisterPlugins.h" \
-    "..\..\src\IceXML\Parser.h" \
+    "$(includedir)\IceXML\Parser.h" \
     "..\..\src\IcePatch2Lib\Util.h" \
     "$(includedir)\IcePatch2\FileInfo.h" \
     "$(includedir)\IcePatch2\Config.h" \
@@ -632,7 +645,7 @@ FileParserI.obj: \
     "$(includedir)\IceGrid\Config.h" \
     "$(includedir)\IceGrid\Descriptor.h" \
     "DescriptorParser.h" \
-    "..\..\src\IceXML\Parser.h" \
+    "$(includedir)\IceXML\Parser.h" \
     "$(includedir)\Ice\ObjectAdapter.h" \
     "$(includedir)\Ice\LocatorF.h" \
     "$(includedir)\Ice\FacetMap.h" \
@@ -768,7 +781,7 @@ Parser.obj: \
     "$(includedir)\Ice\SliceChecksumDict.h" \
     "$(includedir)\Ice\Service.h" \
     "$(includedir)\Ice\RegisterPlugins.h" \
-    "..\..\src\IceXML\Parser.h" \
+    "$(includedir)\IceXML\Parser.h" \
     "Parser.h" \
     "$(includedir)\IceGrid\Admin.h" \
     "$(includedir)\Glacier2\Session.h" \
@@ -1374,6 +1387,237 @@ Scanner.obj: \
     "$(includedir)\IceGrid\Query.h" \
     "Grammar.h" \
 
+IceGridDB.obj: \
+	IceGridDB.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" \
+    "..\..\src\IceDB\IceDB.h" \
+    "$(includedir)\IceUtil\FileUtil.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" \
+    "DBTypes.h" \
+    "..\..\src\IcePatch2Lib\Util.h" \
+    "$(includedir)\IcePatch2\FileInfo.h" \
+    "$(includedir)\IcePatch2\Config.h" \
+    "$(includedir)\IceUtil\DisableWarnings.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" \
+
 AdminRouter.obj: \
 	AdminRouter.cpp \
     "AdminRouter.h" \
@@ -1577,7 +1821,7 @@ FileCache.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\FacetMap.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "FileCache.h" \
     "$(includedir)\IceGrid\Exception.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
@@ -1589,7 +1833,7 @@ PlatformInfo.obj: \
 	PlatformInfo.cpp \
     "$(includedir)\IceUtil\StringUtil.h" \
     "$(includedir)\IceUtil\Config.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\Shared.h" \
     "$(includedir)\IceUtil\Atomic.h" \
     "$(includedir)\IceUtil\Handle.h" \
@@ -1913,7 +2157,7 @@ Activator.obj: \
 	Activator.cpp \
     "..\..\src\IceUtil\ArgVector.h" \
     "$(includedir)\IceUtil\Config.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\Shared.h" \
     "$(includedir)\IceUtil\Atomic.h" \
     "$(includedir)\IceUtil\Handle.h" \
@@ -2214,7 +2458,7 @@ NodeI.obj: \
     "$(includedir)\IceUtil\MutexProtocol.h" \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\Ice\Ice.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\Config.h" \
@@ -2642,7 +2886,7 @@ ServerAdapterI.obj: \
 ServerI.obj: \
 	ServerI.cpp \
     "$(includedir)\IceUtil\DisableWarnings.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\Config.h" \
     "$(includedir)\IceUtil\Shared.h" \
     "$(includedir)\IceUtil\Atomic.h" \
@@ -2789,7 +3033,7 @@ ServerI.obj: \
     "ServerAdapterI.h" \
     "DescriptorHelper.h" \
     "$(includedir)\IceUtil\OutputUtil.h" \
-    "..\..\src\IceXML\Parser.h" \
+    "$(includedir)\IceXML\Parser.h" \
     "..\..\src\IcePatch2Lib\Util.h" \
 
 AdapterCache.obj: \
@@ -3228,7 +3472,7 @@ AdminI.obj: \
     "$(includedir)\IceStorm\Metrics.h" \
     "$(includedir)\IceStorm\Config.h" \
     "Database.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "ServerCache.h" \
     "Allocatable.h" \
     "Cache.h" \
@@ -3248,7 +3492,7 @@ AdminI.obj: \
     "DescriptorParser.h" \
     "DescriptorHelper.h" \
     "$(includedir)\IceUtil\OutputUtil.h" \
-    "..\..\src\IceXML\Parser.h" \
+    "$(includedir)\IceXML\Parser.h" \
     "AdminSessionI.h" \
     "SessionI.h" \
     "ReapThread.h" \
@@ -3422,7 +3666,7 @@ AdminSessionI.obj: \
     "Topics.h" \
     "AdminI.h" \
     "Database.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "ServerCache.h" \
     "Allocatable.h" \
     "Cache.h" \
@@ -3818,7 +4062,7 @@ Database.obj: \
     "$(includedir)\Ice\ObjectAdapter.h" \
     "$(includedir)\Ice\Endpoint.h" \
     "Database.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceGrid\Admin.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
@@ -3865,7 +4109,7 @@ Database.obj: \
     "$(includedir)\Ice\Stream.h" \
     "DescriptorHelper.h" \
     "$(includedir)\IceUtil\OutputUtil.h" \
-    "..\..\src\IceXML\Parser.h" \
+    "$(includedir)\IceXML\Parser.h" \
     "NodeSessionI.h" \
     "ReplicaSessionI.h" \
     "$(includedir)\IceGrid\IceGrid.h" \
@@ -3876,7 +4120,7 @@ Database.obj: \
 FileUserAccountMapperI.obj: \
 	FileUserAccountMapperI.cpp \
     "$(includedir)\IceUtil\DisableWarnings.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\Config.h" \
     "$(includedir)\IceUtil\Shared.h" \
     "$(includedir)\IceUtil\Atomic.h" \
@@ -4099,7 +4343,7 @@ InternalRegistryI.obj: \
     "$(includedir)\IceStorm\Config.h" \
     "InternalRegistryI.h" \
     "Database.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "ServerCache.h" \
     "Allocatable.h" \
     "Cache.h" \
@@ -4263,7 +4507,7 @@ LocatorI.obj: \
     "$(includedir)\IceGrid\Session.h" \
     "$(includedir)\IceGrid\Locator.h" \
     "Database.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "ServerCache.h" \
     "$(includedir)\IceGrid\Query.h" \
     "Allocatable.h" \
@@ -4434,7 +4678,7 @@ LocatorRegistryI.obj: \
     "SessionManager.h" \
     "$(includedir)\IceGrid\Query.h" \
     "Database.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "ServerCache.h" \
     "Allocatable.h" \
     "Cache.h" \
@@ -4615,7 +4859,7 @@ NodeCache.obj: \
     "$(includedir)\IceStorm\Config.h" \
     "DescriptorHelper.h" \
     "$(includedir)\IceUtil\OutputUtil.h" \
-    "..\..\src\IceXML\Parser.h" \
+    "$(includedir)\IceXML\Parser.h" \
 
 NodeSessionI.obj: \
 	NodeSessionI.cpp \
@@ -4752,7 +4996,7 @@ NodeSessionI.obj: \
     "$(includedir)\IceGrid\Registry.h" \
     "$(includedir)\IceGrid\Session.h" \
     "Database.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "ServerCache.h" \
     "$(includedir)\IceGrid\Query.h" \
     "Allocatable.h" \
@@ -5024,7 +5268,7 @@ PluginFacadeI.obj: \
     "$(includedir)\IceGrid\Session.h" \
     "NodeSessionI.h" \
     "Database.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "ServerCache.h" \
     "$(includedir)\IceGrid\Query.h" \
     "Allocatable.h" \
@@ -5147,7 +5391,7 @@ QueryI.obj: \
     "QueryI.h" \
     "$(includedir)\IceGrid\Query.h" \
     "Database.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "ServerCache.h" \
     "Allocatable.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -5316,7 +5560,7 @@ RegistryAdminRouter.obj: \
     "$(includedir)\IceUtil\MutexProtocol.h" \
     "$(includedir)\IceUtil\Shared.h" \
     "$(includedir)\IceUtil\Atomic.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\CommunicatorF.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
@@ -5465,7 +5709,7 @@ RegistryI.obj: \
 	RegistryI.cpp \
     "$(includedir)\IceUtil\UUID.h" \
     "$(includedir)\IceUtil\Config.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\Shared.h" \
     "$(includedir)\IceUtil\Atomic.h" \
     "$(includedir)\IceUtil\Handle.h" \
@@ -5912,7 +6156,7 @@ ReplicaSessionI.obj: \
     "Internal.h" \
     "$(includedir)\IceGrid\Observer.h" \
     "Database.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "ServerCache.h" \
     "$(includedir)\IceGrid\Query.h" \
     "Allocatable.h" \
@@ -6075,7 +6319,7 @@ ReplicaSessionManager.obj: \
     "$(includedir)\IceGrid\Session.h" \
     "TraceLevels.h" \
     "Database.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "ServerCache.h" \
     "Allocatable.h" \
     "Cache.h" \
@@ -6256,7 +6500,7 @@ ServerCache.obj: \
     "$(includedir)\IceUtil\UUID.h" \
     "DescriptorHelper.h" \
     "$(includedir)\IceUtil\OutputUtil.h" \
-    "..\..\src\IceXML\Parser.h" \
+    "$(includedir)\IceXML\Parser.h" \
 
 SessionI.obj: \
 	SessionI.cpp \
@@ -6406,7 +6650,7 @@ SessionI.obj: \
     "$(includedir)\IceGrid\Registry.h" \
     "$(includedir)\IceGrid\Locator.h" \
     "Database.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "ServerCache.h" \
     "Allocatable.h" \
     "Cache.h" \
@@ -6702,7 +6946,7 @@ Topics.obj: \
     "$(includedir)\IceGrid\Session.h" \
     "DescriptorHelper.h" \
     "$(includedir)\IceUtil\OutputUtil.h" \
-    "..\..\src\IceXML\Parser.h" \
+    "$(includedir)\IceXML\Parser.h" \
 
 WellKnownObjectsManager.obj: \
 	WellKnownObjectsManager.cpp \
@@ -6798,7 +7042,7 @@ WellKnownObjectsManager.obj: \
     "$(includedir)\IceGrid\Session.h" \
     "$(includedir)\IceGrid\Locator.h" \
     "Database.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "ServerCache.h" \
     "$(includedir)\IceGrid\Query.h" \
     "Allocatable.h" \
@@ -6850,7 +7094,7 @@ IceGridNode.obj: \
     "$(includedir)\IceUtil\Monitor.h" \
     "$(includedir)\IceUtil\Cond.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\Ice\Ice.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\Config.h" \
diff --git a/cpp/src/IcePatch2/.depend.mak b/cpp/src/IcePatch2/.depend.mak
index ee0e03890d6..8dd23e9a528 100755
--- a/cpp/src/IcePatch2/.depend.mak
+++ b/cpp/src/IcePatch2/.depend.mak
@@ -2,7 +2,7 @@
 FileServerI.obj: \
 	FileServerI.cpp \
     "$(includedir)\IceUtil\DisableWarnings.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\Config.h" \
     "$(includedir)\IceUtil\Shared.h" \
     "$(includedir)\IceUtil\Atomic.h" \
@@ -143,7 +143,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Atomic.h" \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\DisableWarnings.h" \
     "$(includedir)\Ice\Service.h" \
     "$(includedir)\Ice\Ice.h" \
@@ -405,7 +405,7 @@ Calc.obj: \
     "$(includedir)\IceUtil\Atomic.h" \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "..\..\src\IcePatch2Lib\Util.h" \
     "$(includedir)\Ice\Ice.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
diff --git a/cpp/src/IcePatch2Lib/.depend.mak b/cpp/src/IcePatch2Lib/.depend.mak
index 32ebf0f27a2..dbf4cbd9d70 100755
--- a/cpp/src/IcePatch2Lib/.depend.mak
+++ b/cpp/src/IcePatch2Lib/.depend.mak
@@ -12,7 +12,7 @@ ClientUtil.obj: \
 	ClientUtil.cpp \
     "$(includedir)\IceUtil\StringUtil.h" \
     "$(includedir)\IceUtil\Config.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\Shared.h" \
     "$(includedir)\IceUtil\Atomic.h" \
     "$(includedir)\IceUtil\Handle.h" \
@@ -168,7 +168,7 @@ Util.obj: \
     "$(includedir)\IceUtil\UniquePtr.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\SHA1.h" \
     "Util.h" \
     "$(includedir)\Ice\Ice.h" \
diff --git a/cpp/src/IceSSL/.depend.mak b/cpp/src/IceSSL/.depend.mak
index 39ec4f0e9b2..88383320dee 100755
--- a/cpp/src/IceSSL/.depend.mak
+++ b/cpp/src/IceSSL/.depend.mak
@@ -1059,7 +1059,7 @@ SChannelEngine.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\FacetMap.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\UUID.h" \
 
 SChannelTransceiverI.obj: \
@@ -1468,7 +1468,7 @@ Util.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\Connection.h" \
     "$(includedir)\Ice\Endpoint.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
     "$(includedir)\Ice\LocalException.h" \
     "..\..\src\Ice\Network.h" \
diff --git a/cpp/src/IceStorm/.depend.mak b/cpp/src/IceStorm/.depend.mak
index b7a6d9a2252..beb72d0c62f 100755
--- a/cpp/src/IceStorm/.depend.mak
+++ b/cpp/src/IceStorm/.depend.mak
@@ -70,6 +70,17 @@ SubscriberRecord.h: \
     "$(slicedir)/Ice/Metrics.ice" \
     "$(slicedir)/Ice/BuiltinSequences.ice"
 
+DBTypes.h: \
+    DBTypes.ice \
+    ../IceStorm/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" \
+    ../IceStorm/LLURecord.ice
+
 Instance.obj: \
 	Instance.cpp \
     "Instance.h" \
@@ -201,6 +212,7 @@ Instance.obj: \
     "$(includedir)\Ice\Service.h" \
     "$(includedir)\Ice\RegisterPlugins.h" \
     "..\..\src\IceDB\IceDB.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "TraceLevels.h" \
     "Observers.h" \
     "$(includedir)\IceUtil\IceUtil.h" \
@@ -467,6 +479,7 @@ NodeI.obj: \
     "Instrumentation.h" \
     "Util.h" \
     "..\..\src\IceDB\IceDB.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "Observers.h" \
     "TraceLevels.h" \
 
@@ -610,6 +623,7 @@ Observers.obj: \
     "Instrumentation.h" \
     "Util.h" \
     "..\..\src\IceDB\IceDB.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "TraceLevels.h" \
 
 Service.obj: \
@@ -699,8 +713,7 @@ Service.obj: \
     "SubscriberRecord.h" \
     "LLURecord.h" \
     "Instrumentation.h" \
-    "TopicManagerI.h" \
-    "Replica.h" \
+    "Util.h" \
     "$(includedir)\Ice\Ice.h" \
     "$(includedir)\Ice\DeprecatedStringConverter.h" \
     "$(includedir)\Ice\Initialize.h" \
@@ -746,11 +759,13 @@ Service.obj: \
     "$(includedir)\Ice\SliceChecksums.h" \
     "$(includedir)\Ice\Service.h" \
     "$(includedir)\Ice\RegisterPlugins.h" \
+    "..\..\src\IceDB\IceDB.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
+    "TopicManagerI.h" \
+    "Replica.h" \
     "$(includedir)\IceUtil\RecMutex.h" \
     "TransientTopicManagerI.h" \
     "Instance.h" \
-    "Util.h" \
-    "..\..\src\IceDB\IceDB.h" \
     "Service.h" \
     "$(includedir)\IceBox\IceBox.h" \
     "$(includedir)\IceBox\Config.h" \
@@ -904,6 +919,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\Service.h" \
     "$(includedir)\Ice\RegisterPlugins.h" \
     "..\..\src\IceDB\IceDB.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "TraceLevels.h" \
     "NodeI.h" \
     "$(includedir)\IceUtil\IceUtil.h" \
@@ -997,8 +1013,6 @@ TopicI.obj: \
     "SubscriberRecord.h" \
     "LLURecord.h" \
     "Instrumentation.h" \
-    "Instance.h" \
-    "$(includedir)\Ice\PropertiesF.h" \
     "Util.h" \
     "$(includedir)\Ice\Ice.h" \
     "$(includedir)\Ice\DeprecatedStringConverter.h" \
@@ -1007,6 +1021,7 @@ TopicI.obj: \
     "$(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" \
@@ -1047,6 +1062,8 @@ TopicI.obj: \
     "$(includedir)\Ice\Service.h" \
     "$(includedir)\Ice\RegisterPlugins.h" \
     "..\..\src\IceDB\IceDB.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
+    "Instance.h" \
     "Subscriber.h" \
     "$(includedir)\IceUtil\RecMutex.h" \
     "TraceLevels.h" \
@@ -1190,13 +1207,14 @@ TopicManagerI.obj: \
     "SubscriberRecord.h" \
     "LLURecord.h" \
     "Instrumentation.h" \
+    "Util.h" \
+    "..\..\src\IceDB\IceDB.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\RecMutex.h" \
     "TopicI.h" \
     "IceStormInternal.h" \
     "TraceLevels.h" \
     "Instance.h" \
-    "Util.h" \
-    "..\..\src\IceDB\IceDB.h" \
     "NodeI.h" \
     "$(includedir)\IceUtil\IceUtil.h" \
     "$(includedir)\IceUtil\AbstractMutex.h" \
@@ -1416,6 +1434,7 @@ TransientTopicI.obj: \
     "$(includedir)\Ice\Service.h" \
     "$(includedir)\Ice\RegisterPlugins.h" \
     "..\..\src\IceDB\IceDB.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "Subscriber.h" \
     "$(includedir)\IceUtil\RecMutex.h" \
     "TraceLevels.h" \
@@ -1555,6 +1574,7 @@ TransientTopicManagerI.obj: \
     "$(includedir)\Ice\Service.h" \
     "$(includedir)\Ice\RegisterPlugins.h" \
     "..\..\src\IceDB\IceDB.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "Subscriber.h" \
     "$(includedir)\IceUtil\RecMutex.h" \
 
@@ -1681,13 +1701,14 @@ Util.obj: \
     "$(includedir)\Ice\Service.h" \
     "$(includedir)\Ice\RegisterPlugins.h" \
     "..\..\src\IceDB\IceDB.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
+    "LLURecord.h" \
     "SubscriberRecord.h" \
     "$(includedir)\IceStorm\IceStorm.h" \
     "$(includedir)\IceStorm\Metrics.h" \
     "$(includedir)\IceStorm\Config.h" \
     "Instance.h" \
     "Election.h" \
-    "LLURecord.h" \
     "Instrumentation.h" \
 
 Election.obj: \
@@ -2684,3 +2705,226 @@ Scanner.obj: \
     "$(includedir)\IceStorm\Metrics.h" \
     "$(includedir)\IceStorm\Config.h" \
     "Grammar.h" \
+
+IceStormDB.obj: \
+	IceStormDB.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" \
+    "..\..\src\IceDB\IceDB.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
+    "DBTypes.h" \
+    "SubscriberRecord.h" \
+    "$(includedir)\IceStorm\IceStorm.h" \
+    "$(includedir)\IceStorm\Metrics.h" \
+    "$(includedir)\IceStorm\Config.h" \
+    "LLURecord.h" \
+    "..\..\src\IcePatch2Lib\Util.h" \
+    "$(includedir)\IcePatch2\FileInfo.h" \
+    "$(includedir)\IcePatch2\Config.h" \
+    "$(includedir)\IceUtil\DisableWarnings.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/IceUtil/.depend.mak b/cpp/src/IceUtil/.depend.mak
index 0887fbf7c0e..53033f5f33b 100755
--- a/cpp/src/IceUtil/.depend.mak
+++ b/cpp/src/IceUtil/.depend.mak
@@ -62,7 +62,7 @@ Exception.obj: \
 FileUtil.obj: \
 	FileUtil.cpp \
     "$(includedir)\IceUtil\DisableWarnings.h" \
-    "FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\Config.h" \
     "$(includedir)\IceUtil\Shared.h" \
     "$(includedir)\IceUtil\Atomic.h" \
@@ -99,7 +99,7 @@ OutputUtil.obj: \
 	OutputUtil.cpp \
     "$(includedir)\IceUtil\OutputUtil.h" \
     "$(includedir)\IceUtil\Config.h" \
-    "FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\Shared.h" \
     "$(includedir)\IceUtil\Atomic.h" \
     "$(includedir)\IceUtil\Handle.h" \
diff --git a/cpp/src/IceXML/.depend.mak b/cpp/src/IceXML/.depend.mak
index 3d66f0fd053..16cc3c67f9f 100755
--- a/cpp/src/IceXML/.depend.mak
+++ b/cpp/src/IceXML/.depend.mak
@@ -1,10 +1,10 @@
 
 Parser.obj: \
 	Parser.cpp \
-    "Parser.h" \
+    "$(includedir)\IceXML\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" \
+    "$(includedir)\IceUtil\FileUtil.h" \
diff --git a/cpp/src/Slice/.depend.mak b/cpp/src/Slice/.depend.mak
index a4855d54a00..ec4dcc11448 100755
--- a/cpp/src/Slice/.depend.mak
+++ b/cpp/src/Slice/.depend.mak
@@ -115,7 +115,7 @@ Preprocessor.obj: \
     "$(includedir)\IceUtil\OutputUtil.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
     "$(includedir)\IceUtil\StringConverter.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\UUID.h" \
 
 PythonUtil.obj: \
@@ -189,7 +189,7 @@ Python.obj: \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
     "$(includedir)\IceUtil\Options.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\Slice\Preprocessor.h" \
     "$(includedir)\Slice\FileTracker.h" \
     "$(includedir)\Slice\Parser.h" \
@@ -222,7 +222,7 @@ Util.obj: \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\IceUtil\OutputUtil.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
 
 Ruby.obj: \
diff --git a/cpp/src/iceserviceinstall/.depend.mak b/cpp/src/iceserviceinstall/.depend.mak
index 13cdc98eb9c..d925400fb05 100755
--- a/cpp/src/iceserviceinstall/.depend.mak
+++ b/cpp/src/iceserviceinstall/.depend.mak
@@ -129,7 +129,7 @@ ServiceInstaller.obj: \
     "$(includedir)\IceUtil\RecMutex.h" \
     "$(includedir)\IceUtil\UUID.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\src\IceUtil\FileUtil.h" \
+    "$(includedir)\IceUtil\FileUtil.h" \
 
 Install.obj: \
 	Install.cpp \
diff --git a/cpp/test/IceGrid/deployer/.depend.mak b/cpp/test/IceGrid/deployer/.depend.mak
index 4984a1d9dcc..5d872bbf83b 100755
--- a/cpp/test/IceGrid/deployer/.depend.mak
+++ b/cpp/test/IceGrid/deployer/.depend.mak
@@ -738,21 +738,5 @@ Service.obj: \
     "$(includedir)\Ice\RegisterPlugins.h" \
     "$(includedir)\IceBox\IceBox.h" \
     "$(includedir)\IceBox\Config.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" \
     "TestI.h" \
     "Test.h" \
diff --git a/cpp/test/IceUtil/priority/.depend.mak b/cpp/test/IceUtil/priority/.depend.mak
index 3bc94a6fd3a..55f200ac689 100755
--- a/cpp/test/IceUtil/priority/.depend.mak
+++ b/cpp/test/IceUtil/priority/.depend.mak
@@ -135,10 +135,11 @@ PriorityInversion.obj: \
 
 TestSuite.obj: \
 	TestSuite.cpp \
+    "$(includedir)\IceUtil\MutexProtocol.h" \
+    "$(includedir)\IceUtil\Config.h" \
     "TestSuite.h" \
     "TestBase.h" \
     "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
     "$(includedir)\IceUtil\Atomic.h" \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\IceUtil\Exception.h" \
diff --git a/cpp/test/IceUtil/stacktrace/.depend.mak b/cpp/test/IceUtil/stacktrace/.depend.mak
new file mode 100755
index 00000000000..8c0a7bbb278
--- /dev/null
+++ b/cpp/test/IceUtil/stacktrace/.depend.mak
@@ -0,0 +1,33 @@
+
+Client.obj: \
+	Client.cpp \
+    "$(includedir)\IceUtil\StringUtil.h" \
+    "$(includedir)\IceUtil\Config.h" \
+    "$(top_srcdir)\test\include\TestCommon.h" \
+    "$(includedir)\IceUtil\IceUtil.h" \
+    "$(includedir)\IceUtil\PushDisableWarnings.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" \
author	Dwayne Boone <dwayne@zeroc.com>	2015-11-10 12:18:27 -0330
committer	Dwayne Boone <dwayne@zeroc.com>	2015-11-10 12:18:27 -0330
commit	fcc8173b2404c0688e3921dd09d301878c3b960b (patch)
tree	a948189c7dc13aef10169873a31cf0a71b68e54a /cpp
parent	More changes to TesetUtil for Freeze tests (diff)
download	ice-fcc8173b2404c0688e3921dd09d301878c3b960b.tar.bz2 ice-fcc8173b2404c0688e3921dd09d301878c3b960b.tar.xz ice-fcc8173b2404c0688e3921dd09d301878c3b960b.zip