4 files changed, 16 insertions, 26 deletions
diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
index cb83850a048..f401975a569 100644
--- a/cpp/include/Ice/OutgoingAsync.h
+++ b/cpp/include/Ice/OutgoingAsync.h
@@ -22,7 +22,7 @@
 #include <Ice/InputStream.h>
 #include <Ice/ObserverHelper.h>
 #include <Ice/LocalException.h>
-#include <IceUtil/UniquePtr.h>
+#include <Ice/UniquePtr.h>
 
 #ifndef ICE_CPP11_MAPPING
 #    include <Ice/AsyncResult.h>
@@ -171,8 +171,8 @@ protected:
     Ice::LocalObjectPtr _cookie;
 #endif
 
-    IceUtil::UniquePtr<Ice::Exception> _ex;
-    IceUtil::UniquePtr<Ice::LocalException> _cancellationException;
+    IceInternal::UniquePtr<Ice::Exception> _ex;
+    IceInternal::UniquePtr<Ice::LocalException> _cancellationException;
 
     InvocationObserver _observer;
     ObserverHelperT<Ice::Instrumentation::ChildInvocationObserver> _childObserver;
diff --git a/cpp/include/IceUtil/SHA1.h b/cpp/include/Ice/SHA1.h
index d3ec7e48499..7666d0c2a0f 100644
--- a/cpp/include/IceUtil/SHA1.h
+++ b/cpp/include/Ice/SHA1.h
@@ -7,15 +7,15 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_SHA1_H
-#define ICE_UTIL_SHA1_H
+#ifndef ICE_SHA1_H
+#define ICE_SHA1_H
 
-#include <IceUtil/Config.h>
-#include <IceUtil/UniquePtr.h>
+#include <Ice/Config.h>
+#include <Ice/UniquePtr.h>
 
 #include <vector>
 
-namespace IceUtilInternal
+namespace IceInternal
 {
 
 ICE_API void 
@@ -39,7 +39,7 @@ private:
     SHA1 operator=(const SHA1&);
     
     class Hasher;
-    IceUtil::UniquePtr<Hasher> _hasher;
+    UniquePtr<Hasher> _hasher;
 };
 #endif
 
diff --git a/cpp/include/IceUtil/UniquePtr.h b/cpp/include/Ice/UniquePtr.h
index 0a81df47fad..0abf17b5843 100644
--- a/cpp/include/IceUtil/UniquePtr.h
+++ b/cpp/include/Ice/UniquePtr.h
@@ -7,12 +7,12 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UTIL_UNIQUE_PTR_H
-#define ICE_UTIL_UNIQUE_PTR_H
+#ifndef ICE_UNIQUE_PTR_H
+#define ICE_UNIQUE_PTR_H
 
-#include <IceUtil/Config.h>
+#include <Ice/Config.h>
 
-namespace IceUtil
+namespace IceInternal
 {
 
 #ifdef ICE_CPP11_MAPPING
@@ -32,17 +32,6 @@ public:
     {
     }
 
-    UniquePtr(UniquePtr& o) :
-        _ptr(o.release())
-    {
-    }
-
-    UniquePtr& operator=(UniquePtr& o)
-    {
-        reset(o.release());
-        return *this;
-    }
-
     ~UniquePtr()
     {
         if(_ptr != 0)
@@ -79,7 +68,6 @@ public:
         return _ptr;
     }
 
-
     T* get() const
     {
         return _ptr;
@@ -99,6 +87,9 @@ public:
 
 private:
 
+    UniquePtr(UniquePtr&);
+    UniquePtr& operator=(UniquePtr&);
+
     T* _ptr;
 };
 
diff --git a/cpp/include/IceUtil/IceUtil.h b/cpp/include/IceUtil/IceUtil.h
index ca25d393152..b7b3c3c30c3 100644
--- a/cpp/include/IceUtil/IceUtil.h
+++ b/cpp/include/IceUtil/IceUtil.h
@@ -40,7 +40,6 @@
 #include <IceUtil/Time.h>
 #include <IceUtil/Timer.h>
 #include <IceUtil/UUID.h>
-#include <IceUtil/UniquePtr.h>
 
 #include <IceUtil/PopDisableWarnings.h>
 #endif