5 files changed, 17 insertions, 15 deletions

diff --git a/cpp/test/Glacier2/router/Client.cpp b/cpp/test/Glacier2/router/Client.cpp
index bd93abd04cc..f7d007dd943 100644
--- a/cpp/test/Glacier2/router/Client.cpp
+++ b/cpp/test/Glacier2/router/Client.cpp
@@ -65,7 +65,7 @@ public:
 private:
 
     bool _haveResponse;
-    IceUtil::UniquePtr<Exception> _ex;
+    IceInternal::UniquePtr<Exception> _ex;
     Int _response;
 };
 typedef IceUtil::Handle<AsyncCallback> AsyncCallbackPtr;
diff --git a/cpp/test/Ice/background/Configuration.h b/cpp/test/Ice/background/Configuration.h
index 29e7026d90c..367dfaa4429 100644
--- a/cpp/test/Ice/background/Configuration.h
+++ b/cpp/test/Ice/background/Configuration.h
@@ -11,6 +11,7 @@
 #define TEST_CONFIGURATION_H
 
 #include <IceUtil/IceUtil.h>
+#include <Ice/UniquePtr.h>
 
 #include <Ice/LocalException.h>
 #include <Ice/Selector.h>
@@ -53,15 +54,15 @@ public:
 
 private:
 
-    IceUtil::UniquePtr<Ice::LocalException> _connectorsException;
-    IceUtil::UniquePtr<Ice::LocalException> _connectException;
+    IceInternal::UniquePtr<Ice::LocalException> _connectorsException;
+    IceInternal::UniquePtr<Ice::LocalException> _connectException;
     IceInternal::SocketOperation _initializeSocketOperation;
     int _initializeResetCount;
-    IceUtil::UniquePtr<Ice::LocalException> _initializeException;
+    IceInternal::UniquePtr<Ice::LocalException> _initializeException;
     int _readReadyCount;
-    IceUtil::UniquePtr<Ice::LocalException> _readException;
+    IceInternal::UniquePtr<Ice::LocalException> _readException;
     int _writeReadyCount;
-    IceUtil::UniquePtr<Ice::LocalException> _writeException;
+    IceInternal::UniquePtr<Ice::LocalException> _writeException;
     bool _buffered;
 
     static Configuration* _instance;
diff --git a/cpp/test/Ice/interceptor/AMDInterceptorI.h b/cpp/test/Ice/interceptor/AMDInterceptorI.h
index fea7b042f39..e98bb86e6d0 100644
--- a/cpp/test/Ice/interceptor/AMDInterceptorI.h
+++ b/cpp/test/Ice/interceptor/AMDInterceptorI.h
@@ -12,6 +12,7 @@
 
 #include <InterceptorI.h>
 #include <IceUtil/IceUtil.h>
+#include <Ice/UniquePtr.h>
 
 class AMDInterceptorI : public InterceptorI
 {
@@ -31,7 +32,7 @@ private:
 #ifndef ICE_CPP11_MAPPING
     Ice::DispatchInterceptorAsyncCallbackPtr _defaultCb;
 #endif
-    IceUtil::UniquePtr<IceUtil::Exception> _exception;
+    IceInternal::UniquePtr<IceUtil::Exception> _exception;
 
     IceUtil::Mutex _mutex;
 };
diff --git a/cpp/test/IceGrid/activation/AllTests.cpp b/cpp/test/IceGrid/activation/AllTests.cpp
index 8176830298e..8892c284746 100644
--- a/cpp/test/IceGrid/activation/AllTests.cpp
+++ b/cpp/test/IceGrid/activation/AllTests.cpp
@@ -79,7 +79,7 @@ public:
 private:
 
     Ice::ObjectPrx _proxy;
-    IceUtil::UniquePtr<Ice::LocalException> _exception;
+    IceInternal::UniquePtr<Ice::LocalException> _exception;
     bool _finished;
     int _nRepetitions;
 };
@@ -414,7 +414,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         for(p = threads.begin(); p != threads.end(); ++p)
         {
-            IceUtil::UniquePtr<Ice::LocalException> ex((*p)->waitUntilFinished());
+            IceInternal::UniquePtr<Ice::LocalException> ex((*p)->waitUntilFinished());
             test(dynamic_cast<Ice::NoEndpointException*>(ex.get()));
         }
         threads.resize(0);
@@ -430,7 +430,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         for(p = threads.begin(); p != threads.end(); ++p)
         {
-            IceUtil::UniquePtr<Ice::LocalException> ex((*p)->waitUntilFinished());
+            IceInternal::UniquePtr<Ice::LocalException> ex((*p)->waitUntilFinished());
             test(dynamic_cast<Ice::NoEndpointException*>(ex.get()));
         }
         threads.resize(0);
@@ -446,7 +446,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         for(p = threads.begin(); p != threads.end(); ++p)
         {
-            IceUtil::UniquePtr<Ice::LocalException> ex((*p)->waitUntilFinished());
+            IceInternal::UniquePtr<Ice::LocalException> ex((*p)->waitUntilFinished());
             test(dynamic_cast<Ice::NoEndpointException*>(ex.get()));
         }
         threads.resize(0);
@@ -499,7 +499,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         }
         for(p = threads.begin(); p != threads.end(); ++p)
         {
-            IceUtil::UniquePtr<Ice::LocalException> ex((*p)->waitUntilFinished());
+            IceInternal::UniquePtr<Ice::LocalException> ex((*p)->waitUntilFinished());
             test(dynamic_cast<Ice::NoEndpointException*>(ex.get()));
         }
         admin->stopServer("server-activation-timeout");
diff --git a/cpp/test/IceUtil/sha1/Client.cpp b/cpp/test/IceUtil/sha1/Client.cpp
index 1b7c3178590..e8cecbd6ee9 100644
--- a/cpp/test/IceUtil/sha1/Client.cpp
+++ b/cpp/test/IceUtil/sha1/Client.cpp
@@ -7,7 +7,7 @@
 //
 // **********************************************************************
 
-#include <IceUtil/SHA1.h>
+#include <Ice/SHA1.h>
 #include <TestCommon.h>
 
 using namespace std;
@@ -82,7 +82,7 @@ int main(int argc, char* argv[])
     {
         const SHA1Item* item = &items[i];
         vector<unsigned char> buffer;
-        IceUtilInternal::sha1(reinterpret_cast<const unsigned char*>(item->data), strlen(item->data), buffer);
+        IceInternal::sha1(reinterpret_cast<const unsigned char*>(item->data), strlen(item->data), buffer);
         test(buffer.size() == 20);
         string digest = toHex(string(reinterpret_cast<const char*>(&buffer[0]), 20));
         test(item->digest == digest);
@@ -91,7 +91,7 @@ int main(int argc, char* argv[])
     for(int i = 0; i < itemsSize; ++i)
     {
         const SHA1Item* item = &items[i];
-        IceUtilInternal::SHA1 hasher;
+        IceInternal::SHA1 hasher;
         //
         // Test adding the data in chunks
         //