C++11 mapping initial commit

385 files changed, 22088 insertions, 7937 deletions

diff --git a/cpp/config/Make.rules b/cpp/config/Make.rules
index 43bdf0a53ce..aa33556dca6 100644
--- a/cpp/config/Make.rules
+++ b/cpp/config/Make.rules
@@ -146,6 +146,12 @@ USE_READLINE		?= no
 #DEFAULT_MUTEX_PROTOCOL ?= PrioNone
 
 #
+# Define CPP11_MAPPING as yes if you want to build the new moderm C++11
+# mapping.
+#
+#CPP11_MAPPING		?= yes
+
+#
 # Define CPP11 as yes if you want to enable C++11 features in GCC or
 # Clang.
 #
@@ -169,6 +175,11 @@ ifneq ($(shell test "$(USE_BIN_DIST)" != "yes" -a -d $(top_srcdir)/../$(ice_lang
 	ice_require_cpp  = 1
 endif
 
+ifeq ($(CPP11_MAPPING),yes)
+	CPP11		= yes
+	CPPFLAGS	+= -DICE_CPP11_MAPPING
+endif
+
 ifeq ($(shell test -f $(top_srcdir)/config/Make.common.rules && echo 0),0)
 	include $(top_srcdir)/config/Make.common.rules
 else
@@ -394,7 +405,7 @@ all:: $(TARGETS)
 .cpp.o:
 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $<
 	@mkdir -p .depend
-	@$(CXX) -DMAKEDEPEND -MM $(CPPFLAGS) $< > .depend/$(*F).d
+	@$(CXX) -DMAKEDEPEND -MM $(CPPFLAGS) $(CXXFLAGS) $< > .depend/$(*F).d
 
 .c.o:
 	$(CC) -c $(CPPFLAGS) $(CFLAGS) $<
diff --git a/cpp/config/Make.rules.Darwin b/cpp/config/Make.rules.Darwin
index 2ed9068ee7a..3f3a17b7a00 100644
--- a/cpp/config/Make.rules.Darwin
+++ b/cpp/config/Make.rules.Darwin
@@ -41,7 +41,7 @@ endif
 # explicitly set it to no (possibly to test binary compatibility).
 #
 ifneq ($(CPP11), no)
-    CPPFLAGS += --std=c++11
+    CPPFLAGS += --std=c++1y
 endif
 
 #
diff --git a/cpp/config/Make.rules.Linux b/cpp/config/Make.rules.Linux
index fa1ee68185f..74a5879ee22 100644
--- a/cpp/config/Make.rules.Linux
+++ b/cpp/config/Make.rules.Linux
@@ -46,7 +46,7 @@ ifeq ($(GCC_COMPILER),yes)
     endif
 
     ifeq ($(CPP11), yes)
-        CXXFLAGS += -std=c++0x
+        CXXFLAGS += -std=c++1y
     endif
 
     ifeq ($(MACHINE),sparc64)
diff --git a/cpp/config/Make.rules.mak b/cpp/config/Make.rules.mak
index 394adadbe8f..f3d2aab41c5 100755
--- a/cpp/config/Make.rules.mak
+++ b/cpp/config/Make.rules.mak
@@ -48,6 +48,12 @@ prefix			= $(PREFIX)
 #UNIQUE_DLL_NAMES       = yes
 
 #
+# Define CPP11_MAPPING as yes if you want to build the new moderm C++11
+# mapping.
+#
+#CPP11_MAPPING		?= yes
+
+#
 # Define if you want the Ice DLLs and executable files to be authenticode
 # signed.
 #
@@ -68,6 +74,10 @@ slice_translator = slice2cpp.exe
 ice_require_cpp  = 1
 !endif
 
+!if "$(CPP11_MAPPING)" == "yes"
+CPPFLAGS	 	= -DICE_CPP11_MAPPING $(CPPFLAGS)
+!endif
+
 #
 # If CPP_COMPILER is not set, get Make.common.rules.mak to figure it
 # out by setting CPP_COMPILER to "auto"
diff --git a/cpp/include/Ice/ACMF.h b/cpp/include/Ice/ACMF.h
index f4d9d581a36..9f2bebfd358 100644
--- a/cpp/include/Ice/ACMF.h
+++ b/cpp/include/Ice/ACMF.h
@@ -18,12 +18,18 @@ namespace IceInternal
 {
 
 class ACMMonitor;
+class FactoryACMMonitor;
+
+#ifdef ICE_CPP11_MAPPING
+typedef ::std::shared_ptr<ACMMonitor> ACMMonitorPtr;
+typedef ::std::shared_ptr<FactoryACMMonitor> FactoryACMMonitorPtr;
+#else
 ICE_API IceUtil::Shared* upCast(ACMMonitor*);
 typedef IceInternal::Handle<ACMMonitor> ACMMonitorPtr;
 
-class FactoryACMMonitor;
 ICE_API IceUtil::Shared* upCast(FactoryACMMonitor*);
 typedef IceInternal::Handle<FactoryACMMonitor> FactoryACMMonitorPtr;
+#endif
 
 }
 
diff --git a/cpp/include/Ice/AsyncResult.h b/cpp/include/Ice/AsyncResult.h
index 71272445250..a777be04c7b 100644
--- a/cpp/include/Ice/AsyncResult.h
+++ b/cpp/include/Ice/AsyncResult.h
@@ -23,7 +23,7 @@
 #include <Ice/ObserverHelper.h>
 #include <Ice/BasicStream.h>
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
 #   include <functional> // for std::function
 #endif
 
@@ -31,16 +31,30 @@ namespace IceInternal
 {
 
 class CallbackBase;
-typedef IceUtil::Handle<CallbackBase> CallbackBasePtr;
+ICE_DEFINE_PTR(CallbackBasePtr, CallbackBase);
 
 }
 
 namespace Ice
 {
 
-class ICE_API AsyncResult : public Ice::LocalObject, private IceUtil::noncopyable
+class ICE_API AsyncResult : private IceUtil::noncopyable,
+#ifdef ICE_CPP11_MAPPING
+    public ::std::enable_shared_from_this<::Ice::AsyncResult>
+#else
+    public Ice::LocalObject
+#endif
 {
 public:
+    
+#ifdef ICE_CPP11_MAPPING
+    AsyncResult(const CommunicatorPtr&, const IceInternal::InstancePtr&, const std::string&,
+                const IceInternal::CallbackBasePtr&);
+#else
+    AsyncResult(const CommunicatorPtr&, const IceInternal::InstancePtr&, const std::string&,
+                const IceInternal::CallbackBasePtr&, const LocalObjectPtr&);
+#endif
+    virtual ~AsyncResult(); // Must be heap-allocated
 
     void cancel();
 
@@ -48,7 +62,7 @@ public:
 
     CommunicatorPtr getCommunicator() const;
     virtual ConnectionPtr getConnection() const;
-    virtual ObjectPrx getProxy() const;
+    virtual ObjectPrxPtr getProxy() const;
 
     bool isCompleted() const;
     void waitForCompleted();
@@ -59,7 +73,11 @@ public:
     void throwLocalException() const;
 
     bool sentSynchronously() const;
+
+#ifndef ICE_CPP11_MAPPING
     LocalObjectPtr getCookie() const;
+#endif
+
     const std::string& getOperation() const;
 
     ::IceInternal::BasicStream* __startReadParams()
@@ -91,10 +109,6 @@ protected:
 
     static void __check(const AsyncResultPtr&, const ::std::string&);
 
-    AsyncResult(const CommunicatorPtr&, const IceInternal::InstancePtr&, const std::string&,
-                const IceInternal::CallbackBasePtr&, const LocalObjectPtr&);
-    virtual ~AsyncResult(); // Must be heap-allocated
-
     bool sent(bool);
     bool finished(bool);
     bool finished(const Exception&);
@@ -157,14 +171,16 @@ namespace IceInternal
 //
 // Base class for all callbacks.
 //
-class ICE_API CallbackBase : public IceUtil::Shared
+class ICE_API CallbackBase : public ICE_ENABLE_SHARED_FROM_THIS(CallbackBase)
 {
 public:
 
     void checkCallback(bool, bool);
 
     virtual void completed(const ::Ice::AsyncResultPtr&) const = 0;
+#ifndef ICE_CPP11_MAPPING
     virtual CallbackBasePtr verify(const ::Ice::LocalObjectPtr&) = 0;
+#endif
     virtual void sent(const ::Ice::AsyncResultPtr&) const = 0;
     virtual bool hasSentCallback() const = 0;
 };
@@ -231,7 +247,7 @@ private:
     Callback _sent;
 };
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
 
 template<typename T> struct callback_type
 {
@@ -334,6 +350,7 @@ public:
 namespace Ice
 {
 
+#ifndef ICE_CPP11_MAPPING
 typedef IceUtil::Handle< ::IceInternal::GenericCallbackBase> CallbackPtr;
 
 template<class T> CallbackPtr
@@ -352,17 +369,18 @@ newCallback(T* instance,
     return new ::IceInternal::AsyncCallback<T>(instance, cb, sentcb);
 }
 
-#ifdef ICE_CPP11
+#   ifdef ICE_CPP11_COMPILER
 
 ICE_API CallbackPtr
 newCallback(const ::IceInternal::Function<void (const AsyncResultPtr&)>&,
             const ::IceInternal::Function<void (const AsyncResultPtr&)>& =
                ::IceInternal::Function<void (const AsyncResultPtr&)>());
+#   endif
 #endif
+}
 
 //
 // Operation callbacks are specified in Proxy.h
 //
-}
 
 #endif
diff --git a/cpp/include/Ice/AsyncResultF.h b/cpp/include/Ice/AsyncResultF.h
index 1ca4d3d7469..023954fff9a 100644
--- a/cpp/include/Ice/AsyncResultF.h
+++ b/cpp/include/Ice/AsyncResultF.h
@@ -18,8 +18,13 @@ namespace Ice
 {
 
 class AsyncResult;
+
+#ifdef ICE_CPP11_MAPPING
+typedef ::std::shared_ptr<AsyncResult> AsyncResultPtr;
+#else
 ICE_API IceUtil::Shared* upCast(::Ice::AsyncResult*);
 typedef IceInternal::Handle<AsyncResult> AsyncResultPtr;
+#endif
 
 }
 
diff --git a/cpp/include/Ice/BasicStream.h b/cpp/include/Ice/BasicStream.h
index 33406d3ac49..6fc8e06d90b 100644
--- a/cpp/include/Ice/BasicStream.h
+++ b/cpp/include/Ice/BasicStream.h
@@ -13,8 +13,9 @@
 #include <IceUtil/StringConverter.h>
 #include <Ice/InstanceF.h>
 #include <Ice/Object.h>
+#include <Ice/ValueF.h>
 #include <Ice/ProxyF.h>
-#include <Ice/ObjectFactoryF.h>
+#include <Ice/ObjectFactory.h>
 #include <Ice/ObjectFactoryManagerF.h>
 #include <Ice/Buffer.h>
 #include <Ice/Protocol.h>
@@ -22,6 +23,7 @@
 #include <Ice/UserExceptionFactory.h>
 #include <Ice/StreamHelpers.h>
 #include <Ice/FactoryTable.h>
+#include <Ice/Traits.h>
 
 namespace Ice
 {
@@ -34,10 +36,19 @@ namespace IceInternal
 {
 
 template<typename T> inline void
-patchHandle(void* addr, const Ice::ObjectPtr& v)
+patchHandle(void* addr, const Ice::ValuePtr& v)
 {
+#ifdef ICE_CPP11_MAPPING
+    ::std::shared_ptr<T>* handle = static_cast<::std::shared_ptr<T>*>(addr);
+    *handle = ::std::dynamic_pointer_cast<T>(v);
+    if(v && !handle)
+    {
+        IceInternal::Ex::throwUOE(T::ice_staticId(), v);
+    }
+#else
     IceInternal::Handle<T>* p = static_cast<IceInternal::Handle<T>*>(addr);
     __patch(*p, v); // Generated __patch method, necessary for forward declarations.
+#endif
 }
 
 class ICE_API BasicStream : public Buffer
@@ -45,7 +56,7 @@ class ICE_API BasicStream : public Buffer
 public:
 
     typedef size_t size_type;
-    typedef void (*PatchFunc)(void*, const Ice::ObjectPtr&);
+    typedef void (*PatchFunc)(void*, const Ice::ValuePtr&);
 
     BasicStream(Instance*, const Ice::EncodingVersion&);
     BasicStream(Instance*, const Ice::EncodingVersion&, const Ice::Byte*, const Ice::Byte*);
@@ -626,7 +637,13 @@ public:
     void read(std::pair<const Ice::Int*, const Ice::Int*>&, ::IceUtil::ScopedArray<Ice::Int>&);
 
     // Long
+
+#ifdef ICE_CPP11_MAPPING
+    void write(long long int);
+#else
     void write(Ice::Long);
+#endif
+
     void write(const Ice::Long*, const Ice::Long*);
     void read(Ice::Long&);
     void read(std::vector<Ice::Long>&);
@@ -780,6 +797,32 @@ public:
     void read(std::vector<std::wstring>&);
 
     // Proxy
+#ifdef ICE_CPP11_MAPPING
+    void writeProxy(const Ice::ObjectPrxPtr&);
+
+    template<typename T, typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, T>::value>::type* = nullptr>
+    void write(const ::std::shared_ptr<T>& v)
+    {
+        writeProxy(::std::static_pointer_cast<::Ice::ObjectPrx>(v));
+    }
+
+    ::Ice::ObjectPrxPtr readProxy();
+
+    template<typename T, typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, T>::value>::type* = nullptr>
+    void read(::std::shared_ptr<T>& v)
+    {
+        ::std::shared_ptr<::Ice::ObjectPrx> proxy(readProxy());
+        if(!proxy)
+        {
+            v = 0;
+        }
+        else
+        {
+            v = ::std::make_shared<T>();
+            v->__copyFrom(proxy);
+        }
+    }
+#else
     void write(const Ice::ObjectPrx&);
     template<typename T> void write(const IceInternal::ProxyHandle<T>& v)
     {
@@ -790,8 +833,23 @@ public:
     {
         __read(this, v); // Generated __read method, necessary for forward declarations.
     }
+#endif
 
     // Class
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+    template<typename T, typename ::std::enable_if<::std::is_base_of<::Ice::Value, T>::value>::type* = nullptr>
+    void write(const ::std::shared_ptr<T>& v)
+    {
+        initWriteEncaps();
+        _currentWriteEncaps->encoder->write(v);
+    }
+
+    template<typename T, typename ::std::enable_if<::std::is_base_of<::Ice::Value, T>::value>::type* = nullptr>
+    void read(::std::shared_ptr<T>& v)
+    {
+        read(&patchHandle<T>, &v);
+    }
+#else // C++98 mapping
     void write(const Ice::ObjectPtr& v)
     {
         initWriteEncaps();
@@ -801,15 +859,18 @@ public:
     {
         write(Ice::ObjectPtr(upCast(v.get())));
     }
+
+    template<typename T> void read(IceInternal::Handle<T>& v)
+    {
+        read(&patchHandle<T>, &v);
+    }
+#endif
+
     void read(PatchFunc patchFunc, void* patchAddr)
     {
         initReadEncaps();
         _currentReadEncaps->decoder->read(patchFunc, patchAddr);
     }
-    template<typename T> void read(IceInternal::Handle<T>& v)
-    {
-        read(&patchHandle<T>, &v);
-    }
 
     // Enum
     Ice::Int readEnum(Ice::Int);
@@ -888,7 +949,7 @@ private:
     class WriteEncaps;
     enum SliceType { NoSlice, ObjectSlice, ExceptionSlice };
 
-    typedef std::vector<Ice::ObjectPtr> ObjectList;
+    typedef std::vector<Ice::ValuePtr> ObjectList;
 
     class ICE_API EncapsDecoder : private ::IceUtil::noncopyable
     {
@@ -922,12 +983,12 @@ private:
         }
 
         std::string readTypeId(bool);
-        Ice::ObjectPtr newInstance(const std::string&);
+        Ice::ValuePtr newInstance(const std::string&);
 
         void addPatchEntry(Ice::Int, PatchFunc, void*);
-        void unmarshal(Ice::Int, const Ice::ObjectPtr&);
+        void unmarshal(Ice::Int, const Ice::ValuePtr&);
 
-        typedef std::map<Ice::Int, Ice::ObjectPtr> IndexToPtrMap;
+        typedef std::map<Ice::Int, Ice::ValuePtr> IndexToPtrMap;
         typedef std::map<Ice::Int, std::string> TypeIdReadMap;
 
         struct PatchEntry
@@ -1084,7 +1145,7 @@ private:
 
         virtual ~EncapsEncoder() { }
 
-        virtual void write(const Ice::ObjectPtr&) = 0;
+        virtual void write(const Ice::ValuePtr&) = 0;
         virtual void write(const Ice::UserException&) = 0;
 
         virtual void startInstance(SliceType, const Ice::SlicedDataPtr&) = 0;
@@ -1112,7 +1173,7 @@ private:
         BasicStream* _stream;
         WriteEncaps* _encaps;
 
-        typedef std::map<Ice::ObjectPtr, Ice::Int> PtrToIndexMap;
+        typedef std::map<Ice::ValuePtr, Ice::Int> PtrToIndexMap;
         typedef std::map<std::string, Ice::Int> TypeIdWriteMap;
 
         // Encapsulation attributes for object marshalling.
@@ -1134,7 +1195,7 @@ private:
         {
         }
 
-        virtual void write(const Ice::ObjectPtr&);
+        virtual void write(const Ice::ValuePtr&);
         virtual void write(const Ice::UserException&);
 
         virtual void startInstance(SliceType, const Ice::SlicedDataPtr&);
@@ -1146,7 +1207,7 @@ private:
 
     private:
 
-        Ice::Int registerObject(const Ice::ObjectPtr&);
+        Ice::Int registerObject(const Ice::ValuePtr&);
 
         // Instance attributes
         SliceType _sliceType;
@@ -1168,7 +1229,7 @@ private:
         {
         }
 
-        virtual void write(const Ice::ObjectPtr&);
+        virtual void write(const Ice::ValuePtr&);
         virtual void write(const Ice::UserException&);
 
         virtual void startInstance(SliceType, const Ice::SlicedDataPtr&);
@@ -1181,7 +1242,7 @@ private:
     private:
 
         void writeSlicedData(const Ice::SlicedDataPtr&);
-        void writeInstance(const Ice::ObjectPtr&);
+        void writeInstance(const Ice::ValuePtr&);
 
         struct InstanceData
         {
diff --git a/cpp/include/Ice/BatchRequestInterceptor.h b/cpp/include/Ice/BatchRequestInterceptor.h
index b8d1c417a63..2c7c4877974 100644
--- a/cpp/include/Ice/BatchRequestInterceptor.h
+++ b/cpp/include/Ice/BatchRequestInterceptor.h
@@ -13,7 +13,7 @@
 #include <IceUtil/Shared.h>
 
 #include <Ice/ProxyF.h>
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
 #   include <functional>
 #endif
 
@@ -31,18 +31,18 @@ public:
     virtual void enqueue() const = 0;
     virtual int getSize() const = 0;
     virtual const std::string& getOperation() const = 0;
-    virtual const Ice::ObjectPrx& getProxy() const = 0;
+    virtual const Ice::ObjectPrxPtr& getProxy() const = 0;
 };
 
-class BatchRequestInterceptor : public IceUtil::Shared
+class BatchRequestInterceptor : public ICE_ENABLE_SHARED_FROM_THIS(BatchRequestInterceptor)
 {
 public:
 
     virtual void enqueue(const BatchRequest&, int, int) = 0;
 };
-typedef IceUtil::Handle<BatchRequestInterceptor> BatchRequestInterceptorPtr;
+ICE_DEFINE_PTR(BatchRequestInterceptorPtr, BatchRequestInterceptor);
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
 ICE_API BatchRequestInterceptorPtr
 newBatchRequestInterceptor(const ::std::function<void (const BatchRequest&, int, int)>&);
 #endif
diff --git a/cpp/include/Ice/CommunicatorAsync.h b/cpp/include/Ice/CommunicatorAsync.h
index 68ebc4919d9..3644fdbc121 100644
--- a/cpp/include/Ice/CommunicatorAsync.h
+++ b/cpp/include/Ice/CommunicatorAsync.h
@@ -12,6 +12,7 @@
 
 #include <Ice/Communicator.h>
 
+#ifndef ICE_CPP11_MAPPING
 namespace Ice
 {
 
@@ -111,5 +112,6 @@ newCallback_Communicator_flushBatchRequests(T* instance, void (T::*excb)(const :
 }
 
 }
+#endif
 
 #endif
diff --git a/cpp/include/Ice/Comparable.h b/cpp/include/Ice/Comparable.h
new file mode 100644
index 00000000000..7becd593401
--- /dev/null
+++ b/cpp/include/Ice/Comparable.h
@@ -0,0 +1,63 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_COMPARABLE_H
+#define ICE_COMPARABLE_H
+
+namespace Ice
+{
+
+template<typename T, typename U>
+inline bool targetEquals(const T& lhs, const U& rhs)
+{
+    if(lhs && rhs)
+    {
+        return *lhs == *rhs;
+    }
+    else
+    {
+        return !lhs && !rhs;
+    }
+}
+
+template<typename T>
+struct TargetEquals
+{
+    bool operator()(const T& lhs, const T& rhs) const
+    {
+        return targetEquals(lhs, rhs);
+    }
+};
+
+
+template<typename T, typename U>
+inline bool targetLess(const T& lhs, const U& rhs)
+{
+    if(lhs && rhs)
+    {
+        return *lhs < *rhs;
+    }
+    else
+    {
+        return !lhs && rhs;
+    }
+}
+
+template<typename T>
+struct TargetLess
+{
+    bool operator()(const T& lhs, const T& rhs) const
+    {
+        return targetLess(lhs, rhs);
+    }
+};
+
+}
+
+#endif
diff --git a/cpp/include/Ice/Config.h b/cpp/include/Ice/Config.h
index 8dbfb467c06..df86c77b149 100644
--- a/cpp/include/Ice/Config.h
+++ b/cpp/include/Ice/Config.h
@@ -81,7 +81,11 @@ namespace Ice
 typedef unsigned char Byte;
 typedef short Short;
 typedef int Int;
+#ifdef ICE_CPP11_MAPPING
+typedef long long int Long;
+#else
 typedef IceUtil::Int64 Long;
+#endif
 typedef float Float;
 typedef double Double;
 
diff --git a/cpp/include/Ice/ConnectionAsync.h b/cpp/include/Ice/ConnectionAsync.h
index 8f5ff18003b..6845bc5a6a2 100644
--- a/cpp/include/Ice/ConnectionAsync.h
+++ b/cpp/include/Ice/ConnectionAsync.h
@@ -16,6 +16,7 @@
 namespace Ice
 {
 
+#ifndef ICE_CPP11_MAPPING
 template<class T>
 class CallbackNC_Connection_flushBatchRequests : public Callback_Connection_flushBatchRequests_Base,
                                                  public ::IceInternal::OnewayCallbackNC<T>
@@ -109,6 +110,7 @@ newCallback_Connection_flushBatchRequests(T* instance, void (T::*excb)(const ::I
 {
     return new Callback_Connection_flushBatchRequests<T, CT>(instance, excb, sentcb);
 }
+#endif
 
 }
 
diff --git a/cpp/include/Ice/ConnectionFactoryF.h b/cpp/include/Ice/ConnectionFactoryF.h
index 453ed0d9304..5e6cce64592 100644
--- a/cpp/include/Ice/ConnectionFactoryF.h
+++ b/cpp/include/Ice/ConnectionFactoryF.h
@@ -22,8 +22,13 @@ ICE_API IceUtil::Shared* upCast(OutgoingConnectionFactory*);
 typedef IceInternal::Handle<OutgoingConnectionFactory> OutgoingConnectionFactoryPtr;
 
 class IncomingConnectionFactory;
+
+#ifdef ICE_CPP11_MAPPING
+typedef ::std::shared_ptr<IncomingConnectionFactory> IncomingConnectionFactoryPtr;
+#else
 ICE_API IceUtil::Shared* upCast(IncomingConnectionFactory*);
 typedef IceInternal::Handle<IncomingConnectionFactory> IncomingConnectionFactoryPtr;
+#endif
 
 }
 
diff --git a/cpp/include/Ice/ConnectionIF.h b/cpp/include/Ice/ConnectionIF.h
index 967fb0c7f5a..bd5dbfc154f 100644
--- a/cpp/include/Ice/ConnectionIF.h
+++ b/cpp/include/Ice/ConnectionIF.h
@@ -17,8 +17,12 @@ namespace Ice
 {
 
 class ConnectionI;
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+typedef ::std::shared_ptr<ConnectionI> ConnectionIPtr;
+#else // C++98 mapping
 ICE_API Ice::LocalObject* upCast(Ice::ConnectionI*);
 typedef IceInternal::Handle<ConnectionI> ConnectionIPtr;
+#endif
 
 }
 
diff --git a/cpp/include/Ice/DefaultObjectFactory.h b/cpp/include/Ice/DefaultObjectFactory.h
index 2eb1879898a..1ec2a01a7af 100644
--- a/cpp/include/Ice/DefaultObjectFactory.h
+++ b/cpp/include/Ice/DefaultObjectFactory.h
@@ -13,6 +13,7 @@
 #include <Ice/Config.h>
 #include <Ice/ObjectFactory.h>
 
+#ifndef ICE_CPP11_MAPPING
 namespace IceInternal
 {
 template<class O>
@@ -44,5 +45,6 @@ private:
 };
 
 }
+#endif
 
 #endif
diff --git a/cpp/include/Ice/Dispatcher.h b/cpp/include/Ice/Dispatcher.h
index eeb76610e38..841df0147b8 100644
--- a/cpp/include/Ice/Dispatcher.h
+++ b/cpp/include/Ice/Dispatcher.h
@@ -14,7 +14,7 @@
 #include <IceUtil/Shared.h>
 #include <IceUtil/Handle.h>
 #include <Ice/ConnectionF.h>
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
 #   include <functional>
 #endif
 
@@ -41,7 +41,7 @@ public:
 
 typedef IceUtil::Handle<Dispatcher> DispatcherPtr;
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
 ICE_API DispatcherPtr
 newDispatcher(const ::std::function<void (const DispatcherCallPtr&, const ConnectionPtr)>&);
 #endif
diff --git a/cpp/include/Ice/Exception.h b/cpp/include/Ice/Exception.h
index 09cf13ccfd5..31a967075ae 100644
--- a/cpp/include/Ice/Exception.h
+++ b/cpp/include/Ice/Exception.h
@@ -15,6 +15,7 @@
 #include <Ice/Format.h>
 #include <Ice/Handle.h>
 #include <Ice/ObjectF.h>
+#include <Ice/ValueF.h>
 #include <Ice/StreamF.h>
 
 namespace IceInternal
@@ -25,7 +26,7 @@ class BasicStream;
 namespace Ex
 {
 
-ICE_API void throwUOE(const ::std::string&, const ::Ice::ObjectPtr&);
+ICE_API void throwUOE(const ::std::string&, const ::Ice::ValuePtr&);
 ICE_API void throwMemoryLimitException(const char*, int, size_t, size_t);
 ICE_API void throwMarshalException(const char*, int, const std::string&);
 
diff --git a/cpp/include/Ice/FactoryTable.h b/cpp/include/Ice/FactoryTable.h
index e1f8d1641f0..24b5243733f 100644
--- a/cpp/include/Ice/FactoryTable.h
+++ b/cpp/include/Ice/FactoryTable.h
@@ -12,7 +12,7 @@
 
 #include <IceUtil/Mutex.h>
 #include <Ice/UserExceptionFactory.h>
-#include <Ice/ObjectFactoryF.h>
+#include <Ice/ObjectFactory.h>
 
 
 namespace Ice
@@ -39,8 +39,12 @@ public:
     IceInternal::UserExceptionFactoryPtr getExceptionFactory(const ::std::string&) const;
     void removeExceptionFactory(const ::std::string&);
 
-    void addObjectFactory(const ::std::string&, const Ice::ObjectFactoryPtr&);
-    Ice::ObjectFactoryPtr getObjectFactory(const ::std::string&) const;
+#ifdef ICE_CPP11_MAPPING
+    void addObjectFactory(const ::std::string&, ::std::function<::Ice::ValuePtr (const ::std::string&)>);
+#else
+    void addObjectFactory(const ::std::string&, const ::Ice::ObjectFactoryPtr&);
+#endif
+    ICE_OBJECT_FACTORY getObjectFactory(const ::std::string&) const;
     void removeObjectFactory(const ::std::string&);
 
     void addTypeId(int, const ::std::string&);
@@ -55,7 +59,7 @@ private:
     typedef ::std::map< ::std::string, EFPair> EFTable;
     EFTable _eft;
 
-    typedef ::std::pair<Ice::ObjectFactoryPtr, int> OFPair;
+    typedef ::std::pair<ICE_OBJECT_FACTORY, int> OFPair;
     typedef ::std::map< ::std::string, OFPair> OFTable;
     OFTable _oft;
 
diff --git a/cpp/include/Ice/FactoryTableInit.h b/cpp/include/Ice/FactoryTableInit.h
index 5d74985ea85..86287412375 100644
--- a/cpp/include/Ice/FactoryTableInit.h
+++ b/cpp/include/Ice/FactoryTableInit.h
@@ -69,7 +69,15 @@ public:
     DefaultObjectFactoryInit(const char* typeId) :
         _typeId(typeId)
     {
+#ifdef ICE_CPP11_MAPPING
+        factoryTable->addObjectFactory(_typeId, 
+                                    [](const std::string&)
+                                    {
+                                        return ::std::make_shared<O>();
+                                    });
+#else
         factoryTable->addObjectFactory(_typeId, new DefaultObjectFactory<O>(_typeId));
+#endif
     }
 
     ~DefaultObjectFactoryInit()
diff --git a/cpp/include/Ice/Functional.h b/cpp/include/Ice/Functional.h
index 14e80302ef1..7265855f5b3 100644
--- a/cpp/include/Ice/Functional.h
+++ b/cpp/include/Ice/Functional.h
@@ -22,115 +22,115 @@ namespace Ice
 {
 
 template<class R, class T>
-inline ::IceUtilInternal::MemFun<R, T, ::IceInternal::Handle<T> >
+inline ::IceUtilInternal::MemFun<R, T, ICE_INTERNAL_HANDLE<T> >
 memFun(R (T::*p)(void))
 {
-    return ::IceUtilInternal::MemFun<R, T, ::IceInternal::Handle<T> >(p);
+    return ::IceUtilInternal::MemFun<R, T, ICE_INTERNAL_HANDLE<T> >(p);
 }
 
 template<class R, class T, class A>
-inline ::IceUtilInternal::MemFun1<R, T, ::IceInternal::Handle<T>, A>
+inline ::IceUtilInternal::MemFun1<R, T, ICE_INTERNAL_HANDLE<T>, A>
 memFun1(R (T::*p)(A))
 {
-    return ::IceUtilInternal::MemFun1<R, T, ::IceInternal::Handle<T>, A>(p);
+    return ::IceUtilInternal::MemFun1<R, T, ICE_INTERNAL_HANDLE<T>, A>(p);
 }
 
 template<class T>
-inline ::IceUtilInternal::VoidMemFun<T, ::IceInternal::Handle<T> >
+inline ::IceUtilInternal::VoidMemFun<T, ICE_INTERNAL_HANDLE<T> >
 voidMemFun(void (T::*p)(void))
 {
-    return ::IceUtilInternal::VoidMemFun<T, ::IceInternal::Handle<T> >(p);
+    return ::IceUtilInternal::VoidMemFun<T, ICE_INTERNAL_HANDLE<T> >(p);
 }
 
 template<class T, class A>
-inline ::IceUtilInternal::VoidMemFun1<T, ::IceInternal::Handle<T>, A>
+inline ::IceUtilInternal::VoidMemFun1<T, ICE_INTERNAL_HANDLE<T>, A>
 voidMemFun1(void (T::*p)(A))
 {
-    return ::IceUtilInternal::VoidMemFun1<T, ::IceInternal::Handle<T>, A>(p);
+    return ::IceUtilInternal::VoidMemFun1<T, ICE_INTERNAL_HANDLE<T>, A>(p);
 }
 
 template<class R, class K, class T>
-inline ::IceUtilInternal::SecondMemFun<R, K, T, ::IceInternal::Handle<T> >
+inline ::IceUtilInternal::SecondMemFun<R, K, T, ICE_INTERNAL_HANDLE<T> >
 secondMemFun(R (T::*p)(void))
 {
-    return ::IceUtilInternal::SecondMemFun<R, K, T, ::IceInternal::Handle<T> >(p);
+    return ::IceUtilInternal::SecondMemFun<R, K, T, ICE_INTERNAL_HANDLE<T> >(p);
 }
 
 template<class R, class K, class T, class A>
-inline ::IceUtilInternal::SecondMemFun1<R, K, T, ::IceInternal::Handle<T>, A>
+inline ::IceUtilInternal::SecondMemFun1<R, K, T, ICE_INTERNAL_HANDLE<T>, A>
 secondMemFun1(R (T::*p)(A))
 {
-    return ::IceUtilInternal::SecondMemFun1<R, K, T, ::IceInternal::Handle<T>, A>(p);
+    return ::IceUtilInternal::SecondMemFun1<R, K, T, ICE_INTERNAL_HANDLE<T>, A>(p);
 }
 
 template<class K, class T>
-inline ::IceUtilInternal::SecondVoidMemFun<K, T, ::IceInternal::Handle<T> >
+inline ::IceUtilInternal::SecondVoidMemFun<K, T, ICE_INTERNAL_HANDLE<T> >
 secondVoidMemFun(void (T::*p)(void))
 {
-    return ::IceUtilInternal::SecondVoidMemFun<K, T, ::IceInternal::Handle<T> >(p);
+    return ::IceUtilInternal::SecondVoidMemFun<K, T, ICE_INTERNAL_HANDLE<T> >(p);
 }
 
 template<class K, class T, class A>
-inline ::IceUtilInternal::SecondVoidMemFun1<K, T, ::IceInternal::Handle<T>, A>
+inline ::IceUtilInternal::SecondVoidMemFun1<K, T, ICE_INTERNAL_HANDLE<T>, A>
 secondVoidMemFun1(void (T::*p)(A))
 {
-    return ::IceUtilInternal::SecondVoidMemFun1<K, T, ::IceInternal::Handle<T>, A>(p);
+    return ::IceUtilInternal::SecondVoidMemFun1<K, T, ICE_INTERNAL_HANDLE<T>, A>(p);
 }
 
 template<class R, class T>
-inline ::IceUtilInternal::ConstMemFun<R, T, ::IceInternal::Handle<T> >
+inline ::IceUtilInternal::ConstMemFun<R, T, ICE_INTERNAL_HANDLE<T> >
 constMemFun(R (T::*p)(void) const)
 {
-    return ::IceUtilInternal::ConstMemFun<R, T, ::IceInternal::Handle<T> >(p);
+    return ::IceUtilInternal::ConstMemFun<R, T, ICE_INTERNAL_HANDLE<T> >(p);
 }
 
 template<class R, class T, class A>
-inline ::IceUtilInternal::ConstMemFun1<R, T, ::IceInternal::Handle<T>, A>
+inline ::IceUtilInternal::ConstMemFun1<R, T, ICE_INTERNAL_HANDLE<T>, A>
 constMemFun1(R (T::*p)(A) const)
 {
-    return ::IceUtilInternal::ConstMemFun1<R, T, ::IceInternal::Handle<T>, A>(p);
+    return ::IceUtilInternal::ConstMemFun1<R, T, ICE_INTERNAL_HANDLE<T>, A>(p);
 }
 
 template<class T>
-inline ::IceUtilInternal::ConstVoidMemFun<T, ::IceInternal::Handle<T> >
+inline ::IceUtilInternal::ConstVoidMemFun<T, ICE_INTERNAL_HANDLE<T> >
 constVoidMemFun(void (T::*p)(void) const)
 {
-    return ::IceUtilInternal::ConstVoidMemFun<T, ::IceInternal::Handle<T> >(p);
+    return ::IceUtilInternal::ConstVoidMemFun<T, ICE_INTERNAL_HANDLE<T> >(p);
 }
 
 template<class T, class A>
-inline ::IceUtilInternal::ConstVoidMemFun1<T, ::IceInternal::Handle<T>, A>
+inline ::IceUtilInternal::ConstVoidMemFun1<T, ICE_INTERNAL_HANDLE<T>, A>
 constVoidMemFun1(void (T::*p)(A) const)
 {
-    return ::IceUtilInternal::ConstVoidMemFun1<T, ::IceInternal::Handle<T>, A>(p);
+    return ::IceUtilInternal::ConstVoidMemFun1<T, ICE_INTERNAL_HANDLE<T>, A>(p);
 }
 
 template<class R, class K, class T>
-inline ::IceUtilInternal::SecondConstMemFun<R, K, T, ::IceInternal::Handle<T> >
+inline ::IceUtilInternal::SecondConstMemFun<R, K, T, ICE_INTERNAL_HANDLE<T> >
 secondConstMemFun(R (T::*p)(void) const)
 {
-    return ::IceUtilInternal::SecondConstMemFun<R, K, T, ::IceInternal::Handle<T> >(p);
+    return ::IceUtilInternal::SecondConstMemFun<R, K, T, ICE_INTERNAL_HANDLE<T> >(p);
 }
 
 template<class R, class K, class T, class A>
-inline ::IceUtilInternal::SecondConstMemFun1<R, K, T, ::IceInternal::Handle<T>, A>
+inline ::IceUtilInternal::SecondConstMemFun1<R, K, T, ICE_INTERNAL_HANDLE<T>, A>
 secondConstMemFun1(R (T::*p)(A) const)
 {
-    return ::IceUtilInternal::SecondConstMemFun1<R, K, T, ::IceInternal::Handle<T>, A>(p);
+    return ::IceUtilInternal::SecondConstMemFun1<R, K, T, ICE_INTERNAL_HANDLE<T>, A>(p);
 }
 
 template<class K, class T>
-inline ::IceUtilInternal::SecondConstVoidMemFun<K, T, ::IceInternal::Handle<T> >
+inline ::IceUtilInternal::SecondConstVoidMemFun<K, T, ICE_INTERNAL_HANDLE<T> >
 secondConstVoidMemFun(void (T::*p)(void) const)
 {
-    return ::IceUtilInternal::SecondConstVoidMemFun<K, T, ::IceInternal::Handle<T> >(p);
+    return ::IceUtilInternal::SecondConstVoidMemFun<K, T, ICE_INTERNAL_HANDLE<T> >(p);
 }
 
 template<class K, class T, class A>
-inline ::IceUtilInternal::SecondConstVoidMemFun1<K, T, ::IceInternal::Handle<T>, A>
+inline ::IceUtilInternal::SecondConstVoidMemFun1<K, T, ICE_INTERNAL_HANDLE<T>, A>
 secondConstVoidMemFun1(void (T::*p)(A) const)
 {
-    return ::IceUtilInternal::SecondConstVoidMemFun1<K, T, ::IceInternal::Handle<T>, A>(p);
+    return ::IceUtilInternal::SecondConstVoidMemFun1<K, T, ICE_INTERNAL_HANDLE<T>, A>(p);
 }
 
 }
diff --git a/cpp/include/Ice/GCObject.h b/cpp/include/Ice/GCObject.h
index ec92f86465c..990dee9a475 100644
--- a/cpp/include/Ice/GCObject.h
+++ b/cpp/include/Ice/GCObject.h
@@ -15,6 +15,8 @@
 #include <IceUtil/MutexPtrLock.h>
 #include <IceUtil/Mutex.h>
 
+#ifndef ICE_CPP11_MAPPING
+
 namespace IceInternal
 {
 
@@ -75,3 +77,5 @@ private:
 }
 
 #endif
+
+#endif
diff --git a/cpp/include/Ice/Ice.h b/cpp/include/Ice/Ice.h
index 2f1850f3790..fd9375d26b1 100644
--- a/cpp/include/Ice/Ice.h
+++ b/cpp/include/Ice/Ice.h
@@ -12,6 +12,7 @@
 
 #include <IceUtil/PushDisableWarnings.h>
 #include <Ice/Config.h>
+#include <Ice/Comparable.h>
 #include <Ice/DeprecatedStringConverter.h>
 #include <Ice/Initialize.h>
 #include <Ice/LocalException.h>
@@ -51,6 +52,7 @@
 #   include <Ice/Service.h>
 #endif
 #include <Ice/RegisterPlugins.h>
+#include <Ice/InterfaceByValue.h>
 #include <IceUtil/PopDisableWarnings.h>
 
 #endif
diff --git a/cpp/include/Ice/Incoming.h b/cpp/include/Ice/Incoming.h
index 43628e2e800..b0b26542c83 100644
--- a/cpp/include/Ice/Incoming.h
+++ b/cpp/include/Ice/Incoming.h
@@ -55,7 +55,11 @@ protected:
     Ice::Current _current;
     Ice::ObjectPtr _servant;
     Ice::ServantLocatorPtr _locator;
+#ifdef ICE_CPP11_MAPPING
+    ::std::shared_ptr<void> _cookie;
+#else
     Ice::LocalObjectPtr _cookie;
+#endif
     DispatchObserver _observer;
     bool _response;
     Ice::Byte _compress;
diff --git a/cpp/include/Ice/IncomingAsync.h b/cpp/include/Ice/IncomingAsync.h
index 18fccc41008..6a097698db0 100644
--- a/cpp/include/Ice/IncomingAsync.h
+++ b/cpp/include/Ice/IncomingAsync.h
@@ -13,6 +13,7 @@
 #include <Ice/IncomingAsyncF.h>
 #include <Ice/Incoming.h>
 
+#ifndef ICE_CPP11_MAPPING
 namespace Ice
 {
 
@@ -25,6 +26,7 @@ public:
 };
 
 }
+#endif
 
 namespace IceInternal
 {
@@ -33,7 +35,12 @@ namespace IceInternal
 // We need virtual inheritance from AMDCallback, because we use multiple
 // inheritance from Ice::AMDCallback for generated AMD code.
 //
-class ICE_API IncomingAsync : public IncomingBase, virtual public Ice::AMDCallback
+class ICE_API IncomingAsync : public IncomingBase,
+#ifdef ICE_CPP11_MAPPING
+    public ::std::enable_shared_from_this<IncomingAsync>
+#else
+    public virtual Ice::AMDCallback
+#endif
 {
 public:
 
@@ -44,8 +51,6 @@ public:
     virtual void ice_exception(const ::std::exception&);
     virtual void ice_exception();
 
-protected:
-
     void __response();
     void __exception(const std::exception&);
     void __exception();
@@ -72,6 +77,7 @@ private:
 
 }
 
+#ifndef ICE_CPP11_MAPPING
 namespace Ice
 {
 
@@ -104,5 +110,6 @@ public:
 }
 
 }
+#endif
 
 #endif
diff --git a/cpp/include/Ice/IncomingAsyncF.h b/cpp/include/Ice/IncomingAsyncF.h
index f20b4b8121e..c315e584ebc 100644
--- a/cpp/include/Ice/IncomingAsyncF.h
+++ b/cpp/include/Ice/IncomingAsyncF.h
@@ -14,6 +14,13 @@
 
 #include <Ice/Handle.h>
 
+#ifdef ICE_CPP11_MAPPING
+namespace IceInternal
+{
+class IncomingAsync;
+typedef std::shared_ptr<IncomingAsync> IncomingAsyncPtr;
+};
+#else
 namespace IceInternal
 {
 
@@ -31,5 +38,6 @@ ICE_API IceUtil::Shared* upCast(::Ice::AMD_Object_ice_invoke*);
 typedef IceInternal::Handle<AMD_Object_ice_invoke> AMD_Object_ice_invokePtr;
 
 }
+#endif
 
 #endif
diff --git a/cpp/include/Ice/InstanceF.h b/cpp/include/Ice/InstanceF.h
index 43d73db5c31..66018616914 100644
--- a/cpp/include/Ice/InstanceF.h
+++ b/cpp/include/Ice/InstanceF.h
@@ -20,7 +20,6 @@ namespace IceInternal
 class Instance;
 ICE_API IceUtil::Shared* upCast(Instance*);
 typedef IceInternal::Handle<Instance> InstancePtr;
-
 }
 
 #endif
diff --git a/cpp/include/Ice/InterfaceByValue.h b/cpp/include/Ice/InterfaceByValue.h
new file mode 100644
index 00000000000..b0ba02def8f
--- /dev/null
+++ b/cpp/include/Ice/InterfaceByValue.h
@@ -0,0 +1,56 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_INTERFACE_BY_VALUE_H
+#define ICE_INTERFACE_BY_VALUE_H
+
+#include <Ice/Value.h>
+#include <Ice/BasicStream.h>
+
+#ifdef ICE_CPP11_MAPPING
+
+namespace Ice
+{
+
+template<typename T>
+class InterfaceByValue : public Value
+{
+public:
+
+    virtual void
+    __writeImpl(::IceInternal::BasicStream* __os) const
+    {
+        __os->startWriteSlice(InterfaceTraits<T>::staticId, InterfaceTraits<T>::compactId, true);
+        __os->endWriteSlice();
+    }
+
+    virtual void
+    __readImpl(::IceInternal::BasicStream* __is)
+    {
+        __is->startReadSlice();
+        __is->endReadSlice();
+    }
+
+    virtual const std::string&
+    ice_id() const
+    {
+        return InterfaceTraits<T>::staticId;
+    }
+
+    static const std::string&
+    ice_staticId()
+    {
+        return InterfaceTraits<T>::staticId;
+    }
+};
+
+}
+#endif
+
+#endif
diff --git a/cpp/include/Ice/LoggerUtil.h b/cpp/include/Ice/LoggerUtil.h
index 51ac31a1413..ee23b674690 100644
--- a/cpp/include/Ice/LoggerUtil.h
+++ b/cpp/include/Ice/LoggerUtil.h
@@ -23,7 +23,7 @@ class ICE_API LoggerOutputBase : private IceUtil::noncopyable
 public:
 
     std::string str() const;
-   
+
     std::ostringstream& __str(); // For internal use only. Don't use in your code.
 
 private:
@@ -68,12 +68,18 @@ template<typename T>
 inline LoggerOutputBase&
 operator<<(LoggerOutputBase& out, const T& val)
 {
-    return LoggerOutputInserter<T, IsException<T>::value>::insert(out, val); 
+    return LoggerOutputInserter<T, IsException<T>::value>::insert(out, val);
 }
 
+#ifdef ICE_CPP11_MAPPING
+template<typename T, typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, T>::value>::type* = nullptr>
+inline LoggerOutputBase&
+operator<<(LoggerOutputBase& os, const ::std::shared_ptr<T>& p)
+#else
 template<typename T>
-inline LoggerOutputBase& 
+inline LoggerOutputBase&
 operator<<(LoggerOutputBase& os, const ::IceInternal::ProxyHandle<T>& p)
+#endif
 {
     return os << (p ? p->ice_toString() : "");
 }
@@ -94,7 +100,7 @@ public:
     inline LoggerOutput(const LPtr& lptr) :
         _logger(lptr)
     {}
-    
+
     inline ~LoggerOutput()
     {
         flush();
@@ -112,7 +118,7 @@ public:
     }
 
 private:
-   
+
     LPtr _logger;
 };
 
@@ -126,9 +132,9 @@ public:
     Trace(const LoggerPtr&, const std::string&);
     ~Trace();
     void flush();
-   
+
 private:
-    
+
     LoggerPtr _logger;
     std::string _category;
 };
diff --git a/cpp/include/Ice/MetricsAdminI.h b/cpp/include/Ice/MetricsAdminI.h
index d293201cde2..bd58a673435 100644
--- a/cpp/include/Ice/MetricsAdminI.h
+++ b/cpp/include/Ice/MetricsAdminI.h
@@ -17,7 +17,7 @@
 #include <Ice/Metrics.h>
 
 #ifdef _MSC_VER
-#  define ICE_CPP11_REGEXP
+#  define ICE_CPP11_COMPILER_REGEXP
 #endif
 
 #ifdef __MINGW32__
@@ -25,7 +25,7 @@
     // No regexp support with MinGW, when MinGW C++11 mode is not experimental
     // we can use std::regex.
     //
-#elif defined(ICE_CPP11_REGEXP)
+#elif defined(ICE_CPP11_COMPILER_REGEXP)
 #  include <regex>
 #else
 #  include <regex.h>
@@ -44,14 +44,17 @@ template<typename T> class MetricsHelperT;
 namespace IceInternal
 {
 
-class ICE_API MetricsMapI : public IceUtil::Shared
+class ICE_API MetricsMapI;
+ICE_DEFINE_PTR(MetricsMapIPtr, MetricsMapI);
+
+class ICE_API MetricsMapI : public ICE_ENABLE_SHARED_FROM_THIS(MetricsMapI)
 {
 public:
 
     class ICE_API RegExp : public IceUtil::Shared
     {
     public:
-        
+
         RegExp(const std::string&, const std::string&);
         ~RegExp();
 
@@ -73,7 +76,7 @@ public:
     private:
 
         bool match(const std::string&);
-        
+
         const std::string _attribute;
 
 #ifdef __MINGW32__
@@ -81,7 +84,7 @@ public:
     // No regexp support with MinGW, when MinGW C++11 mode is not experimental
     // we can use std::regex.
     //
-#elif defined(ICE_CPP11_REGEXP)
+#elif defined(ICE_CPP11_COMPILER_REGEXP)
 #   if _MSC_VER < 1600
         std::tr1::regex _regex;
 #   else
@@ -89,9 +92,9 @@ public:
 #   endif
 #else
         regex_t _preg;
-#endif        
+#endif
     };
-    typedef IceUtil::Handle<RegExp> RegExpPtr;
+    ICE_DEFINE_PTR(RegExpPtr, RegExp);
 
     MetricsMapI(const std::string&, const Ice::PropertiesPtr&);
     MetricsMapI(const MetricsMapI&);
@@ -102,7 +105,7 @@ public:
     virtual IceMX::MetricsFailures getFailures(const std::string&) = 0;
     virtual IceMX::MetricsMap getMetrics() const = 0;
 
-    virtual MetricsMapI* clone() const = 0;
+    virtual MetricsMapIPtr clone() const = 0;
 
     const Ice::PropertyDict& getProperties() const;
 
@@ -115,7 +118,6 @@ protected:
     const std::vector<RegExpPtr> _accept;
     const std::vector<RegExpPtr> _reject;
 };
-typedef IceUtil::Handle<MetricsMapI> MetricsMapIPtr;
 
 class ICE_API MetricsMapFactory : public Ice::LocalObject
 {
@@ -124,34 +126,39 @@ public:
     MetricsMapFactory(IceMX::Updater*);
 
     virtual MetricsMapIPtr create(const std::string&, const Ice::PropertiesPtr&) = 0;
-    
+
     void update();
 
 private:
-    
+
     IceMX::Updater* _updater;
 };
-typedef IceUtil::Handle<MetricsMapFactory> MetricsMapFactoryPtr;
+ICE_DEFINE_PTR(MetricsMapFactoryPtr, MetricsMapFactory);
 
 template<class MetricsType> class MetricsMapT : public MetricsMapI, private IceUtil::Mutex
 {
 public:
 
     typedef MetricsType T;
-    typedef IceInternal::Handle<MetricsType> TPtr;
+    typedef ICE_INTERNAL_HANDLE<MetricsType> TPtr;
 
-    typedef IceUtil::Handle<MetricsMapT> MetricsMapTPtr;
+    ICE_DEFINE_PTR(MetricsMapTPtr, MetricsMapT);
 
     typedef IceMX::MetricsMap MetricsType::* SubMapMember;
 
     class EntryT;
-    typedef IceUtil::Handle<EntryT> EntryTPtr;
+    ICE_DEFINE_PTR(EntryTPtr, EntryT);
 
-    class EntryT : public Ice::LocalObject
+    class EntryT
+#ifdef ICE_CPP11_MAPPING
+        : public ::std::enable_shared_from_this<EntryT>
+#else
+        : public Ice::LocalObject
+#endif
     {
     public:
 
-        EntryT(MetricsMapT* map, const TPtr& object, const typename std::list<EntryTPtr>::iterator& p) : 
+        EntryT(MetricsMapT* map, const TPtr& object, const typename std::list<EntryTPtr>::iterator& p) :
             _map(map), _object(object), _detachedPos(p)
         {
         }
@@ -166,7 +173,7 @@ public:
             }
         }
 
-        void  
+        void
         failed(const std::string& exceptionName)
         {
             IceUtil::Mutex::Lock sync(*_map);
@@ -180,7 +187,7 @@ public:
             MetricsMapIPtr m;
             {
                 IceUtil::Mutex::Lock sync(*_map);
-                typename std::map<std::string, std::pair<MetricsMapIPtr, SubMapMember> >::iterator p = 
+                typename std::map<std::string, std::pair<MetricsMapIPtr, SubMapMember> >::iterator p =
                     _subMaps.find(mapName);
                 if(p == _subMaps.end())
                 {
@@ -196,7 +203,7 @@ public:
                 }
                 m = p->second.first;
             }
-                
+
             MetricsMapT<MemberMetricsType>* map = dynamic_cast<MetricsMapT<MemberMetricsType>*>(m.get());
             assert(map);
             return map->getMatching(helper);
@@ -209,7 +216,11 @@ public:
             _object->totalLifetime += lifetime;
             if(--_object->current == 0)
             {
+#ifdef ICE_CPP11_MAPPING
+                _map->detached(this->shared_from_this());
+#else
                 _map->detached(this);
+#endif
             }
         }
 
@@ -241,7 +252,7 @@ public:
         IceMX::MetricsPtr
         clone() const
         {
-            TPtr metrics = TPtr::dynamicCast(_object->ice_clone());
+            TPtr metrics = ICE_DYNAMIC_CAST(T, _object->ice_clone());
             for(typename std::map<std::string, std::pair<MetricsMapIPtr, SubMapMember> >::const_iterator p =
                     _subMaps.begin(); p != _subMaps.end(); ++p)
             {
@@ -364,9 +375,13 @@ public:
             _subMaps.find(subMapName);
         if(p != _subMaps.end())
         {
+#ifdef ICE_CPP11_MAPPING
+            return std::pair<MetricsMapIPtr, SubMapMember>(p->second.second->clone()->shared_from_this(), p->second.first);
+#else
             return std::pair<MetricsMapIPtr, SubMapMember>(p->second.second->clone(), p->second.first);
+#endif
         }
-        return std::pair<MetricsMapIPtr, SubMapMember>(MetricsMapIPtr(), static_cast<SubMapMember>(0));
+        return std::pair<MetricsMapIPtr, SubMapMember>(MetricsMapIPtr(ICE_NULLPTR), static_cast<SubMapMember>(0));
     }
 
     EntryTPtr
@@ -440,10 +455,10 @@ public:
         typename std::map<std::string, EntryTPtr>::const_iterator p = _objects.find(key);
         if(p == _objects.end())
         {
-            TPtr t = new T();
+            TPtr t = ICE_MAKE_SHARED(T);
             t->id = key;
             p = _objects.insert(typename std::map<std::string, EntryTPtr>::value_type(
-                                    key, new EntryT(this, t, _detachedQueue.end()))).first;
+                                    key, ICE_MAKE_SHARED(EntryT, this, t, _detachedQueue.end()))).first;
         }
         p->second->attach(helper);
         return p->second;
@@ -451,12 +466,12 @@ public:
     
 private:
 
-    virtual MetricsMapI* clone() const
+    virtual MetricsMapIPtr clone() const
     {
-        return new MetricsMapT<MetricsType>(*this);
+        return ICE_MAKE_SHARED(MetricsMapT<MetricsType>, *this);
     }
 
-    void detached(EntryT* entry)
+    void detached(EntryTPtr entry)
     {
         // This is called with the map mutex locked.
 
@@ -529,14 +544,14 @@ public:
     virtual MetricsMapIPtr
     create(const std::string& mapPrefix, const Ice::PropertiesPtr& properties)
     {
-        return new MetricsMapT<MetricsType>(mapPrefix, properties, _subMaps);
+        return ICE_MAKE_SHARED(MetricsMapT<MetricsType>, mapPrefix, properties, _subMaps);
     }
 
     template<class SubMapMetricsType> void
     registerSubMap(const std::string& subMap, IceMX::MetricsMap MetricsType::* member)
     {
         _subMaps[subMap] = std::pair<IceMX::MetricsMap MetricsType::*, 
-                                     MetricsMapFactoryPtr>(member, new MetricsMapFactoryT<SubMapMetricsType>(0));
+                                     MetricsMapFactoryPtr>(member, ICE_MAKE_SHARED(MetricsMapFactoryT<SubMapMetricsType>, ICE_NULLPTR));
     }
 
 private:
@@ -569,7 +584,7 @@ private:
     const std::string _name;
     std::map<std::string, MetricsMapIPtr> _maps;
 };
-typedef IceUtil::Handle<MetricsViewI> MetricsViewIPtr;
+ICE_DEFINE_PTR(MetricsViewIPtr, MetricsViewI);
 
 class ICE_API MetricsAdminI : public IceMX::MetricsAdmin, public Ice::PropertiesAdminUpdateCallback,
                               private IceUtil::Mutex
@@ -583,14 +598,14 @@ public:
 
     void updateViews();
 
-    template<class MetricsType> void 
+    template<class MetricsType> void
     registerMap(const std::string& map, IceMX::Updater* updater)
     {
         bool updated;
         MetricsMapFactoryPtr factory;
         {
             Lock sync(*this);
-            factory = new MetricsMapFactoryT<MetricsType>(updater);
+            factory = ICE_MAKE_SHARED(MetricsMapFactoryT<MetricsType>, updater);
             _factories[map] = factory;
             updated = addOrUpdateMap(map, factory);
         }
@@ -604,16 +619,19 @@ public:
     registerSubMap(const std::string& map, const std::string& subMap, IceMX::MetricsMap MetricsType::* member)
     {
         bool updated;
-        IceUtil::Handle<MetricsMapFactoryT<MetricsType> > factory;
+        ICE_HANDLE<MetricsMapFactoryT<MetricsType> > factory;
         {
             Lock sync(*this);
-            
             std::map<std::string, MetricsMapFactoryPtr>::const_iterator p = _factories.find(map);
             if(p == _factories.end())
             {
                 return;
             }
+#ifdef ICE_CPP11_MAPPING
+            factory = ::std::dynamic_pointer_cast<MetricsMapFactoryT<MetricsType>>(p->second);
+#else
             factory = dynamic_cast<MetricsMapFactoryT<MetricsType>*>(p->second.get());
+#endif
             factory->template registerSubMap<MemberMetricsType>(subMap, member);
             removeMap(map);
             updated = addOrUpdateMap(map, factory);
@@ -655,7 +673,7 @@ private:
     const Ice::LoggerPtr _logger;
     Ice::PropertiesPtr _properties;
 };
-typedef IceUtil::Handle<MetricsAdminI> MetricsAdminIPtr;
+ICE_DEFINE_PTR(MetricsAdminIPtr, MetricsAdminI);
 
 };
 
diff --git a/cpp/include/Ice/MetricsFunctional.h b/cpp/include/Ice/MetricsFunctional.h
index a40be09de17..1d738549803 100644
--- a/cpp/include/Ice/MetricsFunctional.h
+++ b/cpp/include/Ice/MetricsFunctional.h
@@ -21,6 +21,23 @@ template<typename R> struct ReferenceWrapper
     }
 };
 
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+template<typename R> struct ReferenceWrapper<::std::shared_ptr<R> >
+{
+    static R* get(const ::std::shared_ptr<R>& v)
+    {
+        return v.get();
+    }
+};
+
+template<typename R> struct ReferenceWrapper<const ::std::shared_ptr<R>& >
+{
+    static R* get(const ::std::shared_ptr<R>& v)
+    {
+        return v.get();
+    }
+};
+#else // C++98 mapping
 template<typename R> struct ReferenceWrapper<IceInternal::ProxyHandle<R> >
 {
     static R* get(const IceInternal::ProxyHandle<R>& v)
@@ -52,6 +69,7 @@ template<typename R> struct ReferenceWrapper<const IceInternal::Handle<R>& >
         return v.get();
     }
 };
+#endif
     
 template<typename R> struct ReferenceWrapper<R*>
 {
diff --git a/cpp/include/Ice/MetricsObserverI.h b/cpp/include/Ice/MetricsObserverI.h
index d87d62eecce..cedfcac6964 100644
--- a/cpp/include/Ice/MetricsObserverI.h
+++ b/cpp/include/Ice/MetricsObserverI.h
@@ -36,7 +36,7 @@ public:
 
     virtual std::string operator()(const std::string&) const = 0;
 
-    virtual void initMetrics(const IceInternal::Handle<T>&) const
+    virtual void initMetrics(const ICE_INTERNAL_HANDLE<T>&) const
     {
         // To be overriden in specialization to initialize state attributes
     }
@@ -266,20 +266,28 @@ protected:
     };
 };
 
-class Updater : public IceUtil::Shared
+class Updater
+#ifndef ICE_CPP11_MAPPING
+    : public IceUtil::Shared
+#endif
 {
 public:
 
     virtual void update() = 0;
 };
-typedef IceUtil::Handle<Updater> UpdaterPtr;
+ICE_DEFINE_PTR(UpdaterPtr, Updater);
 
 template<typename T> class UpdaterT : public Updater
 {
 public:
 
+#ifdef ICE_CPP11_MAPPING
+    UpdaterT(const std::shared_ptr<T>& updater, void (T::*fn)()) :
+#else
     UpdaterT(T* updater, void (T::*fn)()) :
-        _updater(updater), _fn(fn)
+#endif
+        _updater(updater),
+        _fn(fn)
     {
     }
 
@@ -290,22 +298,41 @@ public:
 
 private:
 
+#ifdef ICE_CPP11_MAPPING
+    const ::std::shared_ptr<T> _updater;
+#else
     const IceUtil::Handle<T> _updater;
+#endif
     void (T::*_fn)();
 };
 
-template<typename T> Updater*
+#ifdef ICE_CPP11_MAPPING
+template<typename T> UpdaterPtr
+newUpdater(const std::shared_ptr<T>& updater, void (T::*fn)())
+{
+    if(updater)
+    {
+        return std::make_shared<UpdaterT<T>>(updater, fn);
+    }
+    else
+    {
+        return nullptr;
+    }
+}
+#else
+template<typename T> UpdaterPtr
 newUpdater(const IceInternal::Handle<T>& updater, void (T::*fn)())
 {
     if(updater)
     {
-        return new UpdaterT<T>(updater.get(), fn);
+        return UpdaterPtr(new UpdaterT<T>(updater.get(), fn));
     }
     else
     {
         return 0;
     }
 }
+#endif
 
 template<typename T> class ObserverT : virtual public ::Ice::Instrumentation::Observer
 {
@@ -394,7 +421,7 @@ public:
         return 0;
     }
 
-    template<typename ObserverImpl, typename ObserverMetricsType> IceInternal::Handle<ObserverImpl>
+    template<typename ObserverImpl, typename ObserverMetricsType> ICE_INTERNAL_HANDLE<ObserverImpl>
     getObserver(const std::string& mapName, const MetricsHelperT<ObserverMetricsType>& helper)
     {
         std::vector<typename IceInternal::MetricsMapT<ObserverMetricsType>::EntryTPtr> metricsObjects;
@@ -412,7 +439,7 @@ public:
             return 0;
         }
 
-        IceInternal::Handle<ObserverImpl> obsv = new ObserverImpl();
+        ICE_INTERNAL_HANDLE<ObserverImpl> obsv = ICE_MAKE_SHARED(ObserverImpl);
         obsv->init(helper, metricsObjects);
         return obsv;
     }
@@ -429,10 +456,15 @@ class ObserverFactoryT : public Updater, private IceUtil::Mutex
 {
 public:
 
+#ifdef ICE_CPP11_MAPPING
+    typedef ::std::shared_ptr<ObserverImplType> ObserverImplPtrType;
+    typedef typename ObserverImplType::MetricsType MetricsType;
+    typedef std::vector<::std::shared_ptr<IceInternal::MetricsMapT<MetricsType> > > MetricsMapSeqType;
+#else
     typedef IceUtil::Handle<ObserverImplType> ObserverImplPtrType;
     typedef typename ObserverImplType::MetricsType MetricsType;
-
     typedef std::vector<IceUtil::Handle<IceInternal::MetricsMapT<MetricsType> > > MetricsMapSeqType;
+#endif
 
     ObserverFactoryT(const IceInternal::MetricsAdminIPtr& metrics, const std::string& name) :
         _metrics(metrics), _name(name), _enabled(0)
@@ -472,7 +504,7 @@ public:
             return 0;
         }
 
-        ObserverImplPtrType obsv = new ObserverImplType();
+        ObserverImplPtrType obsv = ICE_MAKE_SHARED(ObserverImplType);
         obsv->init(helper, metricsObjects);
         return obsv;
     }
@@ -480,7 +512,11 @@ public:
     template<typename ObserverPtrType> ObserverImplPtrType
     getObserver(const MetricsHelperT<MetricsType>& helper, const ObserverPtrType& observer)
     {
+#ifdef ICE_CPP11_MAPPING
+        ObserverImplPtrType old = ::std::dynamic_pointer_cast<ObserverImplType>(observer);
+#else
         ObserverImplPtrType old = ObserverImplPtrType::dynamicCast(observer);
+#endif
         if(!observer || !old)
         {
             return getObserver(helper);
@@ -508,7 +544,7 @@ public:
             return 0;
         }
 
-        ObserverImplPtrType obsv = new ObserverImplType();
+        ObserverImplPtrType obsv = ICE_MAKE_SHARED(ObserverImplType);
         obsv->init(helper, metricsObjects, old.get());
         return obsv;
     }
@@ -539,7 +575,11 @@ public:
             _maps.clear();
             for(std::vector<IceInternal::MetricsMapIPtr>::const_iterator p = maps.begin(); p != maps.end(); ++p)
             {
+#ifdef ICE_CPP11_MAPPING
+                _maps.push_back(::std::dynamic_pointer_cast<IceInternal::MetricsMapT<MetricsType>>(*p));
+#else
                 _maps.push_back(IceUtil::Handle<IceInternal::MetricsMapT<MetricsType> >::dynamicCast(*p));
+#endif
                 assert(_maps.back());
             }
             _enabled.exchange(_maps.empty() ? 0 : 1);
diff --git a/cpp/include/Ice/NativePropertiesAdmin.h b/cpp/include/Ice/NativePropertiesAdmin.h
index f5ea2fa97bf..559e626413f 100644
--- a/cpp/include/Ice/NativePropertiesAdmin.h
+++ b/cpp/include/Ice/NativePropertiesAdmin.h
@@ -33,22 +33,28 @@ namespace Ice
 // Ice ignores any exceptions raised by the callback.
 //
 
-class ICE_API PropertiesAdminUpdateCallback : virtual public Ice::LocalObject
+class ICE_API PropertiesAdminUpdateCallback 
+#ifndef ICE_CPP11_MAPPING
+    : virtual public Ice::LocalObject
+#endif
 {
 public:
 
     virtual void updated(const PropertyDict&) = 0;
 };
-typedef IceUtil::Handle<PropertiesAdminUpdateCallback> PropertiesAdminUpdateCallbackPtr;
+ICE_DEFINE_PTR(PropertiesAdminUpdateCallbackPtr, PropertiesAdminUpdateCallback);
 
-class ICE_API NativePropertiesAdmin : virtual public IceUtil::Shared
+class ICE_API NativePropertiesAdmin
+#ifndef ICE_CPP11_MAPPING
+    : virtual public IceUtil::Shared
+#endif
 {
 public:
 
     virtual void addUpdateCallback(const PropertiesAdminUpdateCallbackPtr&) = 0;
     virtual void removeUpdateCallback(const PropertiesAdminUpdateCallbackPtr&) = 0;
 };
-typedef IceUtil::Handle<NativePropertiesAdmin> NativePropertiesAdminPtr;
+ICE_DEFINE_PTR(NativePropertiesAdminPtr, NativePropertiesAdmin);
 
 }
 
diff --git a/cpp/include/Ice/Object.h b/cpp/include/Ice/Object.h
index 315e55a72e0..404fd23b6c5 100644
--- a/cpp/include/Ice/Object.h
+++ b/cpp/include/Ice/Object.h
@@ -58,10 +58,14 @@ public:
     virtual const Current& getCurrent() = 0;
 };
 
-class ICE_API Object : virtual public IceUtil::Shared
+
+#ifdef ICE_CPP11_MAPPING
+class ICE_API Object
 {
 public:
 
+    virtual ~Object() = default;
+        
     virtual bool operator==(const Object&) const;
     virtual bool operator<(const Object&) const;
 
@@ -76,21 +80,42 @@ public:
 
     virtual const std::string& ice_id(const Current& = Current()) const;
     DispatchStatus ___ice_id(IceInternal::Incoming&, const Current&);
-
-    virtual Int ice_operationAttributes(const std::string&) const;
-
+    
     static const std::string& ice_staticId();
 
     virtual ObjectPtr ice_clone() const;
 
-    virtual void ice_preMarshal();
-    virtual void ice_postUnmarshal();
-
     static std::string __all[];
 
     virtual DispatchStatus ice_dispatch(Ice::Request&, const DispatchInterceptorAsyncCallbackPtr& = 0);
     virtual DispatchStatus __dispatch(IceInternal::Incoming&, const Current&);
 
+protected:
+
+    static void __checkMode(OperationMode, OperationMode);
+};
+#else
+class ICE_API Object  : public virtual IceUtil::Shared
+{
+public:
+
+    virtual bool operator==(const Object&) const;
+    virtual bool operator<(const Object&) const;
+
+    virtual bool ice_isA(const std::string&, const Current& = Current()) const;
+    DispatchStatus ___ice_isA(IceInternal::Incoming&, const Current&);
+
+    virtual void ice_ping(const Current&  = Current()) const;
+    DispatchStatus ___ice_ping(IceInternal::Incoming&, const Current&);
+
+    virtual std::vector< std::string> ice_ids(const Current& = Current()) const;
+    DispatchStatus ___ice_ids(IceInternal::Incoming&, const Current&);
+
+    virtual const std::string& ice_id(const Current& = Current()) const;
+    DispatchStatus ___ice_id(IceInternal::Incoming&, const Current&);
+
+    virtual Int ice_operationAttributes(const std::string&) const;
+    
     virtual void __write(IceInternal::BasicStream*) const;
     virtual void __read(IceInternal::BasicStream*);
 
@@ -99,12 +124,26 @@ public:
 
     virtual bool __gcVisit(IceInternal::GCVisitor&) { return false; };
     virtual void ice_collectable(bool) { };
+    
+    virtual void ice_preMarshal();
+    virtual void ice_postUnmarshal();
+    
+    static const std::string& ice_staticId();
+
+    virtual ObjectPtr ice_clone() const;
+
+    static std::string __all[];
+
+    virtual DispatchStatus ice_dispatch(Ice::Request&, const DispatchInterceptorAsyncCallbackPtr& = 0);
+    virtual DispatchStatus __dispatch(IceInternal::Incoming&, const Current&);
 
 protected:
 
     Object() {} // This class is abstract.
     virtual ~Object() {}
 
+protected:
+
     virtual void __writeImpl(IceInternal::BasicStream*) const {}
     virtual void __readImpl(IceInternal::BasicStream*) {}
 
@@ -113,6 +152,7 @@ protected:
 
     static void __checkMode(OperationMode, OperationMode);
 };
+#endif
 
 class ICE_API Blobject : virtual public Object
 {
@@ -142,8 +182,11 @@ class ICE_API BlobjectAsync : virtual public Object
 {
 public:
 
+#ifdef ICE_CPP11_MAPPING
+    // TODO
+#else
     virtual void ice_invoke_async(const AMD_Object_ice_invokePtr&, const std::vector<Byte>&, const Current&) = 0;
-
+#endif
     virtual DispatchStatus __dispatch(IceInternal::Incoming&, const Current&);
 };
 
@@ -151,14 +194,17 @@ class ICE_API BlobjectArrayAsync : virtual public Object
 {
 public:
 
+#ifdef ICE_CPP11_MAPPING
+    // TODO
+#else
     virtual void ice_invoke_async(const AMD_Object_ice_invokePtr&, const std::pair<const Byte*, const Byte*>&,
                                   const Current&) = 0;
-
+#endif
     virtual DispatchStatus __dispatch(IceInternal::Incoming&, const Current&);
 };
 
-ICE_API void ice_writeObject(const OutputStreamPtr&, const ObjectPtr&);
-ICE_API void ice_readObject(const InputStreamPtr&, ObjectPtr&);
+ICE_API void ice_writeObject(const OutputStreamPtr&, const ValuePtr&);
+ICE_API void ice_readObject(const InputStreamPtr&, ValuePtr&);
 
 }
 
diff --git a/cpp/include/Ice/ObjectAdapterFactoryF.h b/cpp/include/Ice/ObjectAdapterFactoryF.h
index 76a68fd34d1..a763f462813 100644
--- a/cpp/include/Ice/ObjectAdapterFactoryF.h
+++ b/cpp/include/Ice/ObjectAdapterFactoryF.h
@@ -18,8 +18,12 @@ namespace IceInternal
 {
 
 class ObjectAdapterFactory;
+#ifdef ICE_CPP11_MAPPING
+typedef ::std::shared_ptr<ObjectAdapterFactory> ObjectAdapterFactoryPtr;
+#else
 IceUtil::Shared* upCast(ObjectAdapterFactory*);
 typedef IceInternal::Handle<ObjectAdapterFactory> ObjectAdapterFactoryPtr;
+#endif
 
 }
 
diff --git a/cpp/include/Ice/ObjectF.h b/cpp/include/Ice/ObjectF.h
index b338248efc5..d579cb4e87f 100644
--- a/cpp/include/Ice/ObjectF.h
+++ b/cpp/include/Ice/ObjectF.h
@@ -17,9 +17,14 @@ namespace Ice
 {
 
 class Object;
+#ifdef ICE_CPP11_MAPPING
+typedef ::std::shared_ptr<Object> ObjectPtr;
+#else
 ICE_API Object* upCast(Object*);
 typedef IceInternal::Handle< Object > ObjectPtr;
+typedef ObjectPtr ValuePtr;
 ICE_API void __patch(ObjectPtr&, const ObjectPtr&);
+#endif
 
 }
 
diff --git a/cpp/include/Ice/ObserverHelper.h b/cpp/include/Ice/ObserverHelper.h
index 869fba423db..b294ee872d9 100644
--- a/cpp/include/Ice/ObserverHelper.h
+++ b/cpp/include/Ice/ObserverHelper.h
@@ -21,7 +21,11 @@ template<typename T = Ice::Instrumentation::Observer> class ObserverHelperT
 {
 public:
 
+#ifdef ICE_CPP11_MAPPING
+    typedef ::std::shared_ptr<T> TPtr;
+#else
     typedef IceInternal::Handle<T> TPtr;
+#endif
 
     ObserverHelperT()
     {
@@ -37,7 +41,7 @@ public:
 
     operator bool() const
     {
-        return _observer;
+        return _observer != ICE_NULLPTR;
     }
 
     T* operator->() const
@@ -63,11 +67,17 @@ public:
         }
     }
 
+#ifdef ICE_CPP11_MAPPING
+    TPtr get() const
+    {
+        return _observer;
+    }
+#else
     T* get() const
     {
         return _observer.get();
     }
-
+#endif
     void adopt(ObserverHelperT& other)
     {
         _observer = other._observer;
@@ -121,13 +131,13 @@ class ICE_API InvocationObserver : public ObserverHelperT<Ice::Instrumentation::
 {
 public:
 
-    InvocationObserver(IceProxy::Ice::Object*, const std::string&, const Ice::Context*);
+    InvocationObserver(const Ice::ObjectPrxPtr&, const std::string&, const Ice::Context*);
     InvocationObserver(Instance*, const std::string&);
     InvocationObserver()
     {
     }
 
-    void attach(IceProxy::Ice::Object*, const std::string&, const Ice::Context*);
+    void attach(const Ice::ObjectPrxPtr&, const std::string&, const Ice::Context*);
     void attach(Instance*, const std::string&);
 
     void retried()
diff --git a/cpp/include/Ice/Outgoing.h b/cpp/include/Ice/Outgoing.h
index 62aea1f7c63..e518e528d94 100644
--- a/cpp/include/Ice/Outgoing.h
+++ b/cpp/include/Ice/Outgoing.h
@@ -77,7 +77,7 @@ class ICE_API ProxyOutgoingBase : public OutgoingBase
 {
 public:
 
-    ProxyOutgoingBase(IceProxy::Ice::Object*, Ice::OperationMode);
+    ProxyOutgoingBase(const Ice::ObjectPrxPtr&, Ice::OperationMode);
     ~ProxyOutgoingBase();
 
     virtual bool invokeRemote(const Ice::ConnectionIPtr&, bool, bool) = 0;
@@ -96,7 +96,7 @@ protected:
     // Optimization. The request handler and the reference may not be
     // deleted while a stack-allocated Outgoing still holds it.
     //
-    IceProxy::Ice::Object* _proxy;
+    Ice::ObjectPrxPtr _proxy;
     Ice::OperationMode _mode;
     RequestHandlerPtr _handler;
     IceUtil::Time _invocationTimeoutDeadline;
@@ -117,7 +117,7 @@ class ICE_API Outgoing : public ProxyOutgoingBase
 {
 public:
 
-    Outgoing(IceProxy::Ice::Object*, const std::string&, Ice::OperationMode, const Ice::Context*);
+    Outgoing(const Ice::ObjectPrxPtr&, const std::string&, Ice::OperationMode, const Ice::Context*);
     ~Outgoing();
 
     virtual bool invokeRemote(const Ice::ConnectionIPtr&, bool, bool);
@@ -190,7 +190,7 @@ class ProxyFlushBatch : public ProxyOutgoingBase
 {
 public:
 
-    ProxyFlushBatch(IceProxy::Ice::Object*, const std::string&);
+    ProxyFlushBatch(const Ice::ObjectPrxPtr&, const std::string&);
 
     virtual bool invokeRemote(const Ice::ConnectionIPtr&, bool, bool);
     virtual void invokeCollocated(CollocatedRequestHandler*);
diff --git a/cpp/include/Ice/OutgoingAsync.h b/cpp/include/Ice/OutgoingAsync.h
index 440a39138fb..3646dd58351 100644
--- a/cpp/include/Ice/OutgoingAsync.h
+++ b/cpp/include/Ice/OutgoingAsync.h
@@ -17,6 +17,8 @@
 #include <Ice/ConnectionIF.h>
 #include <Ice/ObjectAdapterF.h>
 
+#include <exception>
+
 namespace IceInternal
 {
 
@@ -64,9 +66,12 @@ public:
 
 protected:
 
+#ifdef ICE_CPP11_MAPPING
+    OutgoingAsyncBase(const Ice::CommunicatorPtr&, const InstancePtr&, const std::string&, const CallbackBasePtr&);
+#else
     OutgoingAsyncBase(const Ice::CommunicatorPtr&, const InstancePtr&, const std::string&, const CallbackBasePtr&,
                       const Ice::LocalObjectPtr&);
-
+#endif
     bool sent(bool);
     bool finished(const Ice::Exception&);
 
@@ -88,7 +93,7 @@ public:
     virtual AsyncStatus invokeRemote(const Ice::ConnectionIPtr&, bool, bool) = 0;
     virtual AsyncStatus invokeCollocated(CollocatedRequestHandler*) = 0;
 
-    virtual Ice::ObjectPrx getProxy() const;
+    virtual Ice::ObjectPrxPtr getProxy() const;
 
     using OutgoingAsyncBase::sent;
     virtual bool completed(const Ice::Exception&);
@@ -100,9 +105,12 @@ public:
 
 protected:
 
-    ProxyOutgoingAsyncBase(const Ice::ObjectPrx&, const std::string&, const CallbackBasePtr&,
+#ifdef ICE_CPP11_MAPPING
+    ProxyOutgoingAsyncBase(const Ice::ObjectPrxPtr&, const std::string&, const CallbackBasePtr&);
+#else
+    ProxyOutgoingAsyncBase(const Ice::ObjectPrxPtr&, const std::string&, const CallbackBasePtr&,
                            const Ice::LocalObjectPtr&);
-
+#endif
     void invokeImpl(bool);
 
     bool sent(bool);
@@ -112,7 +120,7 @@ protected:
     int handleException(const Ice::Exception&);
     virtual void runTimerTask();
 
-    const Ice::ObjectPrx _proxy;
+    const Ice::ObjectPrxPtr _proxy;
     RequestHandlerPtr _handler;
     Ice::OperationMode _mode;
 
@@ -129,8 +137,11 @@ class ICE_API OutgoingAsync : public ProxyOutgoingAsyncBase
 {
 public:
 
-    OutgoingAsync(const Ice::ObjectPrx&, const std::string&, const CallbackBasePtr&, const Ice::LocalObjectPtr&);
-
+#ifdef ICE_CPP11_MAPPING
+    OutgoingAsync(const Ice::ObjectPrxPtr&, const std::string&, const CallbackBasePtr&);
+#else
+    OutgoingAsync(const Ice::ObjectPrxPtr&, const std::string&, const CallbackBasePtr&, const Ice::LocalObjectPtr&);
+#endif
     void prepare(const std::string&, Ice::OperationMode, const Ice::Context*);
 
     virtual bool sent();
@@ -187,7 +198,11 @@ class ICE_API ProxyFlushBatchAsync : public ProxyOutgoingAsyncBase
 {
 public:
 
-    ProxyFlushBatchAsync(const Ice::ObjectPrx&, const std::string&, const CallbackBasePtr&, const Ice::LocalObjectPtr&);
+#ifdef ICE_CPP11_MAPPING
+    ProxyFlushBatchAsync(const Ice::ObjectPrxPtr&, const std::string&, const CallbackBasePtr&);
+#else
+    ProxyFlushBatchAsync(const Ice::ObjectPrxPtr&, const std::string&, const CallbackBasePtr&, const Ice::LocalObjectPtr&);
+#endif
 
     virtual AsyncStatus invokeRemote(const Ice::ConnectionIPtr&, bool, bool);
     virtual AsyncStatus invokeCollocated(CollocatedRequestHandler*);
@@ -207,8 +222,11 @@ class ICE_API ProxyGetConnection :  public ProxyOutgoingAsyncBase
 {
 public:
 
-    ProxyGetConnection(const Ice::ObjectPrx&, const std::string&, const CallbackBasePtr&, const Ice::LocalObjectPtr&);
-
+#ifdef ICE_CPP11_MAPPING
+    ProxyGetConnection(const Ice::ObjectPrxPtr&, const std::string&, const CallbackBasePtr&);
+#else
+    ProxyGetConnection(const Ice::ObjectPrxPtr&, const std::string&, const CallbackBasePtr&, const Ice::LocalObjectPtr&);
+#endif
     virtual AsyncStatus invokeRemote(const Ice::ConnectionIPtr&, bool, bool);
     virtual AsyncStatus invokeCollocated(CollocatedRequestHandler*);
 
@@ -223,9 +241,13 @@ class ICE_API ConnectionFlushBatchAsync : public OutgoingAsyncBase
 {
 public:
 
+#ifdef ICE_CPP11_MAPPING
+    ConnectionFlushBatchAsync(const Ice::ConnectionIPtr&, const Ice::CommunicatorPtr&, const InstancePtr&,
+                              const std::string&, const CallbackBasePtr&);
+#else
     ConnectionFlushBatchAsync(const Ice::ConnectionIPtr&, const Ice::CommunicatorPtr&, const InstancePtr&,
                               const std::string&, const CallbackBasePtr&, const Ice::LocalObjectPtr&);
-
+#endif
     virtual Ice::ConnectionPtr getConnection() const;
 
     void invoke();
@@ -243,8 +265,13 @@ class ICE_API CommunicatorFlushBatchAsync : public Ice::AsyncResult
 {
 public:
 
+#ifdef ICE_CPP11_MAPPING
+    CommunicatorFlushBatchAsync(const Ice::CommunicatorPtr&, const InstancePtr&, const std::string&,
+                                const CallbackBasePtr&);
+#else
     CommunicatorFlushBatchAsync(const Ice::CommunicatorPtr&, const InstancePtr&, const std::string&,
                                 const CallbackBasePtr&, const Ice::LocalObjectPtr&);
+#endif
 
     void flushConnection(const Ice::ConnectionIPtr&);
     void ready();
@@ -258,4 +285,98 @@ private:
 
 }
 
+//
+// Base callback for C++11 mapping
+//
+#ifdef ICE_CPP11_MAPPING
+namespace IceInternal
+{
+
+class ICE_API OnewayClosureCallback : public ::IceInternal::GenericCallbackBase
+{
+public:
+
+    OnewayClosureCallback(const std::string&,
+             const std::shared_ptr<Ice::ObjectPrx>&,
+             std::function<void ()>,
+             std::function<void (::std::exception_ptr)>,
+             std::function<void (bool)>);
+    
+    virtual void
+    sent(const ::Ice::AsyncResultPtr&) const;
+
+    virtual bool
+    hasSentCallback() const;
+    
+    virtual void
+    completed(const ::Ice::AsyncResultPtr&) const;
+    
+    static std::function<void ()>
+    invoke(const std::string&,
+           const std::shared_ptr<Ice::ObjectPrx>&,
+           Ice::OperationMode,
+           Ice::FormatType,
+           std::function<void (::IceInternal::BasicStream*)>,
+           std::function<void ()>,
+           std::function<void (::std::exception_ptr)>,
+           std::function<void (bool)>,
+           const Ice::Context&);
+
+private:
+
+    const std::string& __name;
+    std::shared_ptr<Ice::ObjectPrx> __proxy;
+    std::function<void ()> __response;
+    std::function<void (::std::exception_ptr)> __exception;
+    std::function<void (bool)> __sent;
+};
+
+class ICE_API TwowayClosureCallback : public ::IceInternal::GenericCallbackBase
+{
+public:
+
+    TwowayClosureCallback(const std::string&,
+             const std::shared_ptr<Ice::ObjectPrx>&,
+             bool,
+             std::function<void (::IceInternal::BasicStream*)>,
+             std::function<void (const ::Ice::UserException&)>,
+             std::function<void (::std::exception_ptr)>,
+             std::function<void (bool)>);
+    
+    virtual void
+    sent(const ::Ice::AsyncResultPtr&) const;
+
+    virtual bool
+    hasSentCallback() const;
+    
+    virtual void
+    completed(const ::Ice::AsyncResultPtr&) const;
+    
+    static std::function<void ()>
+    invoke(const std::string&,
+           const std::shared_ptr<Ice::ObjectPrx>&,
+           Ice::OperationMode,
+           Ice::FormatType,
+           std::function<void (::IceInternal::BasicStream*)>,
+           bool,
+           std::function<void (::IceInternal::BasicStream*)>,
+           std::function<void (const ::Ice::UserException&)>,
+           std::function<void (::std::exception_ptr)>,
+           std::function<void (bool)>,
+           const Ice::Context&);
+
+private:
+
+    const std::string& __name;
+    std::shared_ptr<Ice::ObjectPrx> __proxy;
+    bool __readEmptyParams;
+    std::function<void (::IceInternal::BasicStream*)> __read;
+    std::function<void (const ::Ice::UserException&)> __userException;
+    std::function<void (::std::exception_ptr)> __exception;
+    std::function<void (bool)> __sent;
+};
+
+}
+#endif
+
 #endif
diff --git a/cpp/include/Ice/OutgoingAsyncF.h b/cpp/include/Ice/OutgoingAsyncF.h
index c889ba32c4c..677139e7c9b 100644
--- a/cpp/include/Ice/OutgoingAsyncF.h
+++ b/cpp/include/Ice/OutgoingAsyncF.h
@@ -18,21 +18,28 @@ namespace IceInternal
 {
 
 class OutgoingAsyncBase;
+class OutgoingAsync;
+class ProxyOutgoingAsyncBase;
+class CommunicatorFlushBatchAsync;
+
+#ifdef ICE_CPP11_MAPPING
+typedef ::std::shared_ptr<OutgoingAsyncBase> OutgoingAsyncBasePtr;
+typedef ::std::shared_ptr<OutgoingAsync> OutgoingAsyncPtr;
+typedef ::std::shared_ptr<ProxyOutgoingAsyncBase> ProxyOutgoingAsyncBasePtr;
+typedef ::std::shared_ptr<CommunicatorFlushBatchAsync> CommunicatorFlushBatchAsyncPtr;
+#else
 ICE_API IceUtil::Shared* upCast(OutgoingAsyncBase*);
 typedef IceInternal::Handle<OutgoingAsyncBase> OutgoingAsyncBasePtr;
 
-class OutgoingAsync;
 ICE_API IceUtil::Shared* upCast(OutgoingAsync*);
 typedef IceInternal::Handle<OutgoingAsync> OutgoingAsyncPtr;
 
-class ProxyOutgoingAsyncBase;
 ICE_API IceUtil::Shared* upCast(ProxyOutgoingAsyncBase*);
 typedef IceInternal::Handle<ProxyOutgoingAsyncBase> ProxyOutgoingAsyncBasePtr;
 
-class CommunicatorFlushBatchAsync;
 ICE_API IceUtil::Shared* upCast(CommunicatorFlushBatchAsync*);
 typedef IceInternal::Handle<CommunicatorFlushBatchAsync> CommunicatorFlushBatchAsyncPtr;
-
+#endif
 }
 
 #endif
diff --git a/cpp/include/Ice/Proxy.h b/cpp/include/Ice/Proxy.h
index 0d36364fcc9..1f064928b36 100644
--- a/cpp/include/Ice/Proxy.h
+++ b/cpp/include/Ice/Proxy.h
@@ -29,22 +29,12 @@
 #include <Ice/StreamF.h>
 #include <Ice/CommunicatorF.h>
 #include <Ice/ObserverHelper.h>
+#include <Ice/LocalException.h>
 #include <iosfwd>
 
-namespace IceProxy
-{
-
 namespace Ice
 {
-
-class Locator;
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Locator*);
-
-class Router;
-ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Router*);
-
-}
-
+ICE_API extern const Context noExplicitContext;
 }
 
 namespace IceInternal
@@ -54,41 +44,457 @@ class Outgoing;
 
 }
 
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
 namespace Ice
 {
 
-typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Router> RouterPrx;
-typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Locator> LocatorPrx;
+class RouterPrx;
+typedef ::std::shared_ptr<::Ice::RouterPrx> RouterPrxPtr;
+
+class LocatorPrx;
+typedef ::std::shared_ptr<::Ice::LocatorPrx> LocatorPrxPtr;
 
 class LocalException;
+}
 
-ICE_API void ice_writeObjectPrx(const ::Ice::OutputStreamPtr&, const ObjectPrx&);
-ICE_API void ice_readObjectPrx(const ::Ice::InputStreamPtr&, ObjectPrx&);
+namespace Ice
+{
 
-class Callback_Object_ice_isA_Base : virtual public ::IceInternal::CallbackBase { };
-typedef ::IceUtil::Handle< Callback_Object_ice_isA_Base> Callback_Object_ice_isAPtr;
+class ICE_API ObjectPrx : public ::std::enable_shared_from_this<ObjectPrx>
+{
+public:
 
-class Callback_Object_ice_ping_Base : virtual public ::IceInternal::CallbackBase { };
-typedef ::IceUtil::Handle< Callback_Object_ice_ping_Base> Callback_Object_ice_pingPtr;
+    virtual ~ObjectPrx() = default;
 
-class Callback_Object_ice_ids_Base : virtual public ::IceInternal::CallbackBase { };
-typedef ::IceUtil::Handle< Callback_Object_ice_ids_Base> Callback_Object_ice_idsPtr;
+    bool operator==(const ObjectPrx&) const;
+    bool operator!=(const ObjectPrx&) const;
+    bool operator<(const ObjectPrx&) const;
 
-class Callback_Object_ice_id_Base : virtual public ::IceInternal::CallbackBase { };
-typedef ::IceUtil::Handle< Callback_Object_ice_id_Base> Callback_Object_ice_idPtr;
+    ::std::shared_ptr<::Ice::Communicator> ice_getCommunicator() const;
 
-class Callback_Object_ice_invoke_Base : virtual public ::IceInternal::CallbackBase { };
-typedef ::IceUtil::Handle< Callback_Object_ice_invoke_Base> Callback_Object_ice_invokePtr;
+    ::std::string ice_toString() const;
 
-class Callback_Object_ice_flushBatchRequests_Base : virtual public ::IceInternal::CallbackBase { };
-typedef ::IceUtil::Handle< Callback_Object_ice_flushBatchRequests_Base> Callback_Object_ice_flushBatchRequestsPtr;
+    bool ice_isA(const ::std::string& typeId, const ::Ice::Context& context = ::Ice::noExplicitContext);
 
-class Callback_Object_ice_getConnection_Base : virtual public ::IceInternal::CallbackBase { };
-typedef ::IceUtil::Handle< Callback_Object_ice_getConnection_Base> Callback_Object_ice_getConnectionPtr;
+    ::std::function<void()>
+    ice_isA_async(const ::std::string& typeId,
+                  ::std::function<void (bool)> response,
+                  ::std::function<void (::std::exception_ptr)> = nullptr,
+                  ::std::function<void (bool)> sent = nullptr,
+                  const ::Ice::Context& context = ::Ice::noExplicitContext);
+
+    template<template<typename> class P = std::promise>
+    auto ice_isA_async(const ::std::string& typeId, const ::Ice::Context& context = ::Ice::noExplicitContext)
+        -> decltype(std::declval<P<bool>>().get_future())
+    {
+        auto promise = ::std::make_shared<P<bool>>();
+
+        ice_isA_async(
+            typeId,
+            [promise](bool value)
+            {
+                promise->set_value(value);
+            },
+            [promise](::std::exception_ptr ex)
+            {
+                promise->set_exception(::std::move(ex));
+            },
+            nullptr, context);
+
+        return promise->get_future();
+    }
+
+    void
+    ice_ping(const ::Ice::Context& context = ::Ice::noExplicitContext);
+
+    ::std::function<void()>
+    ice_ping_async(::std::function<void ()> response,
+                   ::std::function<void (::std::exception_ptr)> exception = nullptr,
+                   ::std::function<void (bool)> sent = nullptr,
+                   const ::Ice::Context& context = ::Ice::noExplicitContext);
+
+    template<template<typename> class P = std::promise>
+    auto ice_ping_async(const ::Ice::Context& context = ::Ice::noExplicitContext)
+        -> decltype(std::declval<P<void>>().get_future())
+    {
+        auto promise = ::std::make_shared<P<void>>();
+        if(ice_isTwoway())
+        {
+            ice_ping_async(
+                [promise]()
+                {
+                    promise->set_value();
+                },
+                [promise](::std::exception_ptr ex)
+                {
+                    promise->set_exception(::std::move(ex));
+                },
+                nullptr, context);
+        }
+        else if(ice_isOneway() || ice_isDatagram())
+        {
+            ice_ping_async(
+                nullptr,
+                [promise](::std::exception_ptr ex)
+                {
+                    promise->set_exception(::std::move(ex));
+                },
+                [promise](bool)
+                {
+                    promise->set_value();
+                },
+                context);
+        }
+        else
+        {
+            ice_ping_async(nullptr, nullptr, nullptr, context);
+            promise->set_value();
+        }
+        return promise->get_future();
+    }
 
+    ::std::vector<::std::string>
+    ice_ids(const ::Ice::Context& context = ::Ice::noExplicitContext);
+
+    ::std::function<void()>
+    ice_ids_async(::std::function<void (::std::vector< ::std::string>)> response,
+                  ::std::function<void (::std::exception_ptr)> exception = nullptr,
+                  ::std::function<void (bool)> sent = nullptr,
+                  const ::Ice::Context& context = ::Ice::noExplicitContext);
+
+    template<template<typename> class P = std::promise>
+    auto ice_ids_async(const ::Ice::Context& context = ::Ice::noExplicitContext)
+        -> decltype(std::declval<P<::std::vector<::std::string>>>().get_future())
+    {
+        auto promise = ::std::make_shared<P<::std::vector<::std::string>>>();
+        ice_ids_async(
+            [promise](::std::vector<::std::string> ids)
+            {
+                promise->set_value(::std::move(ids));
+            },
+            [promise](::std::exception_ptr ex)
+            {
+                promise->set_exception(::std::move(ex));
+            },
+            nullptr, context);
+        return promise->get_future();
+    }
+
+    ::std::string
+    ice_id(const ::Ice::Context& context = ::Ice::noExplicitContext);
+
+    ::std::function<void ()>
+    ice_id_async(::std::function<void (::std::string)> response,
+                 ::std::function<void (::std::exception_ptr)> exception = nullptr,
+                 ::std::function<void (bool)> sent = nullptr,
+                 const ::Ice::Context& context = ::Ice::noExplicitContext);
+
+    template<template<typename> class P = std::promise>
+    auto ice_id_async(const ::Ice::Context& context = ::Ice::noExplicitContext)
+        -> decltype(std::declval<P<::std::string>>().get_future())
+    {
+        auto promise = ::std::make_shared<P<::std::string>>();
+        ice_id_async(
+            [promise](::std::string id)
+            {
+                promise->set_value(::std::move(id));
+            },
+            [promise](::std::exception_ptr ex)
+            {
+                promise->set_exception(::std::move(ex));
+            },
+            nullptr, context);
+        return promise->get_future();
+    }
+
+    static const ::std::string& ice_staticId()
+    {
+        return ::Ice::Object::ice_staticId();
+    }
+
+    // Returns true if ok, false if user exception.
+    bool
+    ice_invoke(const ::std::string& operation,
+               ::Ice::OperationMode mode,
+               const ::std::vector< ::Ice::Byte>& inParams,
+               ::std::vector< ::Ice::Byte>& outParams,
+               const ::Ice::Context& context = ::Ice::noExplicitContext);
+
+    ::std::function<void ()>
+    ice_invoke_async(
+        const ::std::string&,
+        ::Ice::OperationMode,
+        const ::std::vector<::Ice::Byte>&,
+        ::std::function<void (bool, ::std::vector<::Ice::Byte>)> response,
+        ::std::function<void (::std::exception_ptr)> exception = nullptr,
+        ::std::function<void (bool)> sent = nullptr,
+        const ::Ice::Context& context = ::Ice::noExplicitContext);
+
+    ::Ice::Identity ice_getIdentity() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_identity(const ::Ice::Identity&) const;
+
+    ::Ice::Context ice_getContext() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_context(const ::Ice::Context&) const;
+
+    const ::std::string& ice_getFacet() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_facet(const ::std::string&) const;
+
+    ::std::string ice_getAdapterId() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_adapterId(const ::std::string&) const;
+
+    ::Ice::EndpointSeq ice_getEndpoints() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_endpoints(const ::Ice::EndpointSeq&) const;
+
+    ::Ice::Int ice_getLocatorCacheTimeout() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_locatorCacheTimeout(::Ice::Int) const;
+
+    bool ice_isConnectionCached() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_connectionCached(bool) const;
+
+    ::Ice::EndpointSelectionType ice_getEndpointSelection() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_endpointSelection(::Ice::EndpointSelectionType) const;
+
+    bool ice_isSecure() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_secure(bool) const;
+
+    ::Ice::EncodingVersion ice_getEncodingVersion() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_encodingVersion(const ::Ice::EncodingVersion&) const;
+
+    bool ice_isPreferSecure() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_preferSecure(bool) const;
+
+    ::std::shared_ptr<::Ice::RouterPrx> ice_getRouter() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_router(const ::std::shared_ptr<::Ice::RouterPrx>&) const;
+
+    ::std::shared_ptr<::Ice::LocatorPrx> ice_getLocator() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_locator(const ::std::shared_ptr<::Ice::LocatorPrx>&) const;
+
+    bool ice_isCollocationOptimized() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_collocationOptimized(bool) const;
+
+    ::Ice::Int ice_getInvocationTimeout() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_invocationTimeout(::Ice::Int) const;
+
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_twoway() const;
+    bool ice_isTwoway() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_oneway() const;
+    bool ice_isOneway() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_batchOneway() const;
+    bool ice_isBatchOneway() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_datagram() const;
+    bool ice_isDatagram() const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_batchDatagram() const;
+    bool ice_isBatchDatagram() const;
+
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_compress(bool) const;
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_timeout(int) const;
+
+    ::std::shared_ptr<::Ice::ObjectPrx> ice_connectionId(const ::std::string&) const;
+    ::std::string ice_getConnectionId() const;
+
+
+    ::std::shared_ptr<::Ice::Connection> ice_getConnection();
+
+    ::std::function<void ()>
+    ice_getConnection_async(
+        ::std::function<void (::std::shared_ptr<::Ice::Connection>)> response,
+        ::std::function<void (::std::exception_ptr)> exception = nullptr);
+
+
+    template<template<typename> class P = std::promise>
+    auto ice_getConnection_async()
+        -> decltype(std::declval<P<::std::shared_ptr<::Ice::Connection>>>().get_future())
+    {
+        auto promise = ::std::make_shared<P<::std::shared_ptr<::Ice::Connection>>>();
+        ice_getConnection_async(
+            [promise](::std::shared_ptr<::Ice::Connection> connection)
+            {
+                promise->set_value(::std::move(connection));
+            },
+            [promise](::std::exception_ptr ex)
+            {
+                promise->set_exception(::std::move(ex));
+            });
+        return promise->get_future();
+    }
+
+    ::std::shared_ptr<::Ice::Connection> ice_getCachedConnection() const;
+
+    void ice_flushBatchRequests();
+
+    std::function<void ()>
+    ice_flushBatchRequests_async(
+        ::std::function<void (::std::exception_ptr)> exception,
+        ::std::function<void (bool)> sent = nullptr);
+
+
+    template<template<typename> class P = std::promise>
+    auto ice_flushBatchRequests_async()
+        -> decltype(std::declval<P<bool>>().get_future())
+    {
+        auto promise = ::std::make_shared<P<bool>>();
+        ice_flushBatchRequests_async(
+            [promise](::std::exception_ptr ex)
+            {
+                promise->set_exception(::std::move(ex));
+            },
+            [promise](bool sent)
+            {
+                promise->set_value(sent);
+            });
+        return promise->get_future();
+    }
+
+    const ::IceInternal::ReferencePtr& __reference() const { return _reference; }
+
+    void __copyFrom(const ::Ice::ObjectPrxPtr&);
+
+    int __handleException(const ::Ice::Exception&, const ::IceInternal::RequestHandlerPtr&, ::Ice::OperationMode,
+                          bool, int&);
+
+    void __checkAsyncTwowayOnly(const ::std::string&) const;
+
+    ::IceInternal::RequestHandlerPtr __getRequestHandler();
+    ::IceInternal::BatchRequestQueuePtr __getBatchRequestQueue();
+    ::IceInternal::RequestHandlerPtr __setRequestHandler(const ::IceInternal::RequestHandlerPtr&);
+    void __updateRequestHandler(const ::IceInternal::RequestHandlerPtr&, const ::IceInternal::RequestHandlerPtr&);
+
+protected:
+
+    virtual ::std::shared_ptr<ObjectPrx> __newInstance() const;
+
+private:
+
+    void setup(const ::IceInternal::ReferencePtr&);
+    friend class ::IceInternal::ProxyFactory;
+
+    ::IceInternal::ReferencePtr _reference;
+    ::IceInternal::RequestHandlerPtr _requestHandler;
+    ::IceInternal::BatchRequestQueuePtr _batchRequestQueue;
+    IceUtil::Mutex _mutex;
+};
+
+ICE_API ::std::ostream& operator<<(::std::ostream&, const ::Ice::ObjectPrx&);
+
+ICE_API bool proxyIdentityLess(const ::std::shared_ptr<ObjectPrx>&, const ::std::shared_ptr<ObjectPrx>&);
+ICE_API bool proxyIdentityEqual(const ::std::shared_ptr<ObjectPrx>&, const ::std::shared_ptr<ObjectPrx>&);
+
+ICE_API bool proxyIdentityAndFacetLess(const ::std::shared_ptr<ObjectPrx>&, const ::std::shared_ptr<ObjectPrx>&);
+ICE_API bool proxyIdentityAndFacetEqual(const ::std::shared_ptr<ObjectPrx>&, const ::std::shared_ptr<ObjectPrx>&);
+
+struct ProxyIdentityLess : std::binary_function<bool, ::std::shared_ptr<ObjectPrx>&, ::std::shared_ptr<ObjectPrx>&>
+{
+    bool operator()(const ::std::shared_ptr<ObjectPrx>& lhs, const ::std::shared_ptr<ObjectPrx>& rhs) const
+    {
+        return proxyIdentityLess(lhs, rhs);
+    }
+};
+
+struct ProxyIdentityEqual : std::binary_function<bool, ::std::shared_ptr<ObjectPrx>&, ::std::shared_ptr<ObjectPrx>&>
+{
+    bool operator()(const ::std::shared_ptr<ObjectPrx>& lhs, const ::std::shared_ptr<ObjectPrx>& rhs) const
+    {
+        return proxyIdentityEqual(lhs, rhs);
+    }
+};
+
+struct ProxyIdentityAndFacetLess : std::binary_function<bool, ::std::shared_ptr<ObjectPrx>&, ::std::shared_ptr<ObjectPrx>&>
+{
+    bool operator()(const ::std::shared_ptr<ObjectPrx>& lhs, const ::std::shared_ptr<ObjectPrx>& rhs) const
+    {
+        return proxyIdentityAndFacetLess(lhs, rhs);
+    }
+};
+
+struct ProxyIdentityAndFacetEqual : std::binary_function<bool, ::std::shared_ptr<ObjectPrx>&, ::std::shared_ptr<ObjectPrx>&>
+{
+    bool operator()(const ::std::shared_ptr<ObjectPrx>& lhs, const ::std::shared_ptr<ObjectPrx>& rhs) const
+    {
+        return proxyIdentityAndFacetEqual(lhs, rhs);
+    }
+};
+
+template<typename P,
+         typename T,
+         typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, P>::value>::type* = nullptr,
+         typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, T>::value>::type* = nullptr> ::std::shared_ptr<P>
+uncheckedCast(const ::std::shared_ptr<T>& b)
+{
+    ::std::shared_ptr<P> r;
+    if(b)
+    {
+        r = ::std::dynamic_pointer_cast<P>(b);
+        if(!r)
+        {
+            r = ::std::make_shared<P>();
+            r->__copyFrom(b);
+        }
+    }
+    return r;
 }
 
-#ifdef ICE_CPP11
+template<typename P,
+         typename T,
+         typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, P>::value>::type* = nullptr,
+         typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, T>::value>::type* = nullptr> ::std::shared_ptr<P>
+uncheckedCast(const ::std::shared_ptr<T>& b, const std::string& f)
+{
+    ::std::shared_ptr<P> r;
+    if(b)
+    {
+        r = ::std::make_shared<P>();
+        r->__copyFrom(b->ice_facet(f));
+    }
+    return r;
+}
+
+template<typename P,
+         typename T,
+         typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, P>::value>::type* = nullptr,
+         typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, T>::value>::type* = nullptr> ::std::shared_ptr<P>
+checkedCast(const ::std::shared_ptr<T>& b, const ::Ice::Context& context = Ice::noExplicitContext)
+{
+    ::std::shared_ptr<P> r;
+    if(b)
+    {
+        if(b->ice_isA(P::ice_staticId(), context))
+        {
+            r = ::std::make_shared<P>();
+            r->__copyFrom(b);
+        }
+    }
+    return r;
+}
+
+template<typename P,
+         typename T,
+         typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, P>::value>::type* = nullptr,
+         typename ::std::enable_if<::std::is_base_of<::Ice::ObjectPrx, T>::value>::type* = nullptr> ::std::shared_ptr<P>
+checkedCast(const ::std::shared_ptr<T>& b, const std::string& f, const ::Ice::Context& context = Ice::noExplicitContext)
+{
+    ::std::shared_ptr<P> r;
+    if(b)
+    {
+        try
+        {
+            ::std::shared_ptr<::Ice::ObjectPrx> bb = b->ice_facet(f);
+            if(bb->ice_isA(P::ice_staticId(), context))
+            {
+                r = ::std::make_shared<P>();
+                r->__copyFrom(bb);
+            }
+        }
+        catch(const Ice::FacetNotExistException&)
+        {
+        }
+    }
+    return r;
+}
+
+}
+
+#else // C++98 mapping
+#   ifdef ICE_CPP11_COMPILER
 namespace IceInternal
 {
 
@@ -130,7 +536,59 @@ private:
 };
 
 }
-#endif
+#   endif
+
+namespace IceProxy
+{
+
+namespace Ice
+{
+
+class Locator;
+ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Locator*);
+
+class Router;
+ICE_API ::IceProxy::Ice::Object* upCast(::IceProxy::Ice::Router*);
+
+}
+
+}
+
+namespace Ice
+{
+
+typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Router> RouterPrx;
+typedef RouterPrx RouterPrxPtr;
+typedef ::IceInternal::ProxyHandle< ::IceProxy::Ice::Locator> LocatorPrx;
+typedef LocatorPrx LocatorPrxPtr;
+
+class LocalException;
+
+ICE_API void ice_writeObjectPrx(const ::Ice::OutputStreamPtr&, const ObjectPrxPtr&);
+ICE_API void ice_readObjectPrx(const ::Ice::InputStreamPtr&, ObjectPrxPtr&);
+
+class Callback_Object_ice_isA_Base : virtual public ::IceInternal::CallbackBase { };
+typedef ::IceUtil::Handle< Callback_Object_ice_isA_Base> Callback_Object_ice_isAPtr;
+
+class Callback_Object_ice_ping_Base : virtual public ::IceInternal::CallbackBase { };
+typedef ::IceUtil::Handle< Callback_Object_ice_ping_Base> Callback_Object_ice_pingPtr;
+
+class Callback_Object_ice_ids_Base : virtual public ::IceInternal::CallbackBase { };
+typedef ::IceUtil::Handle< Callback_Object_ice_ids_Base> Callback_Object_ice_idsPtr;
+
+class Callback_Object_ice_id_Base : virtual public ::IceInternal::CallbackBase { };
+typedef ::IceUtil::Handle< Callback_Object_ice_id_Base> Callback_Object_ice_idPtr;
+
+class Callback_Object_ice_invoke_Base : virtual public ::IceInternal::CallbackBase { };
+typedef ::IceUtil::Handle< Callback_Object_ice_invoke_Base> Callback_Object_ice_invokePtr;
+
+class Callback_Object_ice_flushBatchRequests_Base : virtual public ::IceInternal::CallbackBase { };
+typedef ::IceUtil::Handle< Callback_Object_ice_flushBatchRequests_Base> Callback_Object_ice_flushBatchRequestsPtr;
+
+class Callback_Object_ice_getConnection_Base : virtual public ::IceInternal::CallbackBase { };
+typedef ::IceUtil::Handle< Callback_Object_ice_getConnection_Base> Callback_Object_ice_getConnectionPtr;
+
+}
 
 namespace IceProxy { namespace Ice
 {
@@ -147,16 +605,12 @@ public:
 
     ::std::string ice_toString() const;
 
-    bool ice_isA(const ::std::string& typeId)
-    {
-        return ice_isA(typeId, 0);
-    }
-    bool ice_isA(const ::std::string& typeId, const ::Ice::Context& context)
+    bool ice_isA(const ::std::string& typeId, const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
         return ice_isA(typeId, &context);
     }
 
-#ifdef ICE_CPP11
+#   ifdef ICE_CPP11_COMPILER
     ::Ice::AsyncResultPtr
     begin_ice_isA(const ::std::string& typeId,
                   const ::Ice::Context& ctx,
@@ -175,7 +629,7 @@ public:
                   ::IceInternal::Function<void (const ::Ice::Exception&)>(),
                   const ::IceInternal::Function<void (bool)>& sent = ::IceInternal::Function<void (bool)>())
     {
-        return __begin_ice_isA(typeId, 0, response, exception, sent);
+        return __begin_ice_isA(typeId, &::Ice::noExplicitContext, response, exception, sent);
     }
 
     ::Ice::AsyncResultPtr
@@ -184,7 +638,7 @@ public:
                   const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& sent =
                   ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_ice_isA(typeId, 0, ::Ice::newCallback(completed, sent), 0);
+        return begin_ice_isA(typeId, &::Ice::noExplicitContext, ::Ice::newCallback(completed, sent), 0);
     }
 
     ::Ice::AsyncResultPtr
@@ -196,14 +650,9 @@ public:
     {
         return begin_ice_isA(typeId, &ctx, ::Ice::newCallback(completed, sent), 0);
     }
-#endif
-
-    ::Ice::AsyncResultPtr begin_ice_isA(const ::std::string& typeId)
-    {
-        return begin_ice_isA(typeId, 0, ::IceInternal::__dummyCallback, 0);
-    }
+#   endif
 
-    ::Ice::AsyncResultPtr begin_ice_isA(const ::std::string& typeId, const ::Ice::Context& __ctx)
+    ::Ice::AsyncResultPtr begin_ice_isA(const ::std::string& typeId, const ::Ice::Context& __ctx = ::Ice::noExplicitContext)
     {
         return begin_ice_isA(typeId, &__ctx, ::IceInternal::__dummyCallback, 0);
     }
@@ -212,7 +661,7 @@ public:
                                         const ::Ice::CallbackPtr& __del,
                                         const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_ice_isA(typeId, 0, __del, __cookie);
+        return begin_ice_isA(typeId, &::Ice::noExplicitContext, __del, __cookie);
     }
 
     ::Ice::AsyncResultPtr begin_ice_isA(const ::std::string& typeId,
@@ -227,7 +676,7 @@ public:
                                         const ::Ice::Callback_Object_ice_isAPtr& __del,
                                         const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_ice_isA(typeId, 0, __del, __cookie);
+        return begin_ice_isA(typeId, &::Ice::noExplicitContext, __del, __cookie);
     }
 
     ::Ice::AsyncResultPtr begin_ice_isA(const ::std::string& typeId,
@@ -240,23 +689,19 @@ public:
 
     bool end_ice_isA(const ::Ice::AsyncResultPtr&);
 
-    void ice_ping()
-    {
-        ice_ping(0);
-    }
-    void ice_ping(const ::Ice::Context& context)
+    void ice_ping(const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
         ice_ping(&context);
     }
 
-#ifdef ICE_CPP11
+#   ifdef ICE_CPP11_COMPILER
     ::Ice::AsyncResultPtr
     begin_ice_ping(const ::IceInternal::Function<void ()>& response,
                    const ::IceInternal::Function<void (const ::Ice::Exception&)>& exception =
                    ::IceInternal::Function<void (const ::Ice::Exception&)>(),
                    const ::IceInternal::Function<void (bool)>& sent = ::IceInternal::Function<void (bool)>())
     {
-        return __begin_ice_ping(0, response, exception, sent);
+        return __begin_ice_ping(&::Ice::noExplicitContext, response, exception, sent);
     }
 
     ::Ice::AsyncResultPtr
@@ -274,7 +719,7 @@ public:
                    const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& sent =
                    ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_ice_ping(0, ::Ice::newCallback(completed, sent), 0);
+        return begin_ice_ping(&::Ice::noExplicitContext, ::Ice::newCallback(completed, sent), 0);
     }
 
     ::Ice::AsyncResultPtr
@@ -285,14 +730,9 @@ public:
     {
         return begin_ice_ping(&ctx, ::Ice::newCallback(completed, sent), 0);
     }
-#endif
+#   endif
 
-    ::Ice::AsyncResultPtr begin_ice_ping()
-    {
-        return begin_ice_ping(0, ::IceInternal::__dummyCallback, 0);
-    }
-
-    ::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::Context& __ctx)
+    ::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::Context& __ctx = ::Ice::noExplicitContext)
     {
         return begin_ice_ping(&__ctx, ::IceInternal::__dummyCallback, 0);
     }
@@ -300,7 +740,7 @@ public:
     ::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::CallbackPtr& __del,
                                          const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_ice_ping(0, __del, __cookie);
+        return begin_ice_ping(&::Ice::noExplicitContext, __del, __cookie);
     }
 
     ::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::Context& __ctx, const ::Ice::CallbackPtr& __del,
@@ -313,7 +753,7 @@ public:
     ::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::Callback_Object_ice_pingPtr& __del,
                                          const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_ice_ping(0, __del, __cookie);
+        return begin_ice_ping(&::Ice::noExplicitContext, __del, __cookie);
     }
 
     ::Ice::AsyncResultPtr begin_ice_ping(const ::Ice::Context& __ctx, const ::Ice::Callback_Object_ice_pingPtr& __del,
@@ -324,23 +764,19 @@ public:
 
     void end_ice_ping(const ::Ice::AsyncResultPtr&);
 
-    ::std::vector< ::std::string> ice_ids()
-    {
-        return ice_ids(0);
-    }
-    ::std::vector< ::std::string> ice_ids(const ::Ice::Context& context)
+    ::std::vector< ::std::string> ice_ids(const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
         return ice_ids(&context);
     }
 
-#ifdef ICE_CPP11
+#   ifdef ICE_CPP11_COMPILER
     ::Ice::AsyncResultPtr
     begin_ice_ids(const ::IceInternal::Function<void (const ::std::vector< ::std::string>&)>& response,
                   const ::IceInternal::Function<void (const ::Ice::Exception&)>& exception =
                   ::IceInternal::Function<void (const ::Ice::Exception&)>(),
                   const ::IceInternal::Function<void (bool)>& sent = ::IceInternal::Function<void (bool)>())
     {
-        return __begin_ice_ids(0, response, exception, sent);
+        return __begin_ice_ids(&::Ice::noExplicitContext, response, exception, sent);
     }
 
     ::Ice::AsyncResultPtr
@@ -358,7 +794,7 @@ public:
                   const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& sent =
                   ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_ice_ids(0, ::Ice::newCallback(completed, sent), 0);
+        return begin_ice_ids(&::Ice::noExplicitContext, ::Ice::newCallback(completed, sent), 0);
     }
 
     ::Ice::AsyncResultPtr
@@ -369,14 +805,9 @@ public:
     {
         return begin_ice_ids(&ctx, ::Ice::newCallback(completed, sent), 0);
     }
-#endif
+#   endif
 
-    ::Ice::AsyncResultPtr begin_ice_ids()
-    {
-        return begin_ice_ids(0, ::IceInternal::__dummyCallback, 0);
-    }
-
-    ::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::Context& __ctx)
+    ::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::Context& __ctx = ::Ice::noExplicitContext)
     {
         return begin_ice_ids(&__ctx, ::IceInternal::__dummyCallback, 0);
     }
@@ -384,7 +815,7 @@ public:
     ::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::CallbackPtr& __del,
                                         const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_ice_ids(0, __del, __cookie);
+        return begin_ice_ids(&::Ice::noExplicitContext, __del, __cookie);
     }
 
     ::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::Context& __ctx,
@@ -397,7 +828,7 @@ public:
     ::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::Callback_Object_ice_idsPtr& __del,
                                         const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_ice_ids(0, __del, __cookie);
+        return begin_ice_ids(&::Ice::noExplicitContext, __del, __cookie);
     }
 
     ::Ice::AsyncResultPtr begin_ice_ids(const ::Ice::Context& __ctx,
@@ -409,23 +840,19 @@ public:
 
     ::std::vector< ::std::string> end_ice_ids(const ::Ice::AsyncResultPtr&);
 
-    ::std::string ice_id()
-    {
-        return ice_id(0);
-    }
-    ::std::string ice_id(const ::Ice::Context& context)
+    ::std::string ice_id(const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
         return ice_id(&context);
     }
 
-#ifdef ICE_CPP11
+#   ifdef ICE_CPP11_COMPILER
     ::Ice::AsyncResultPtr
     begin_ice_id(const ::IceInternal::Function<void (const ::std::string&)>& response,
                  const ::IceInternal::Function<void (const ::Ice::Exception&)>& exception =
                  ::IceInternal::Function<void (const ::Ice::Exception&)>(),
                  const ::IceInternal::Function<void (bool)>& sent = ::IceInternal::Function<void (bool)>())
     {
-        return __begin_ice_id(0, response, exception, sent);
+        return __begin_ice_id(&::Ice::noExplicitContext, response, exception, sent);
     }
 
     ::Ice::AsyncResultPtr
@@ -443,7 +870,7 @@ public:
                  const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& sent =
                  ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>())
     {
-        return begin_ice_id(0, ::Ice::newCallback(completed, sent), 0);
+        return begin_ice_id(&::Ice::noExplicitContext, ::Ice::newCallback(completed, sent), 0);
     }
 
     ::Ice::AsyncResultPtr
@@ -454,14 +881,9 @@ public:
     {
         return begin_ice_id(&ctx, ::Ice::newCallback(completed, sent), 0);
     }
-#endif
-
-    ::Ice::AsyncResultPtr begin_ice_id()
-    {
-        return begin_ice_id(0, ::IceInternal::__dummyCallback, 0);
-    }
+#   endif
 
-    ::Ice::AsyncResultPtr begin_ice_id(const ::Ice::Context& __ctx)
+    ::Ice::AsyncResultPtr begin_ice_id(const ::Ice::Context& __ctx = ::Ice::noExplicitContext)
     {
         return begin_ice_id(&__ctx, ::IceInternal::__dummyCallback, 0);
     }
@@ -469,7 +891,7 @@ public:
     ::Ice::AsyncResultPtr begin_ice_id(const ::Ice::CallbackPtr& __del,
                                        const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_ice_id(0, __del, __cookie);
+        return begin_ice_id(&::Ice::noExplicitContext, __del, __cookie);
     }
 
     ::Ice::AsyncResultPtr begin_ice_id(const ::Ice::Context& __ctx,
@@ -482,7 +904,7 @@ public:
     ::Ice::AsyncResultPtr begin_ice_id(const ::Ice::Callback_Object_ice_idPtr& __del,
                                        const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_ice_id(0, __del, __cookie);
+        return begin_ice_id(&::Ice::noExplicitContext, __del, __cookie);
     }
 
     ::Ice::AsyncResultPtr begin_ice_id(const ::Ice::Context& __ctx,
@@ -505,21 +927,13 @@ public:
     bool ice_invoke(const ::std::string& operation,
                     ::Ice::OperationMode mode,
                     const ::std::vector< ::Ice::Byte>& inParams,
-                    ::std::vector< ::Ice::Byte>& outParams)
-    {
-        return ice_invoke(operation, mode, inParams, outParams, 0);
-    }
-
-    bool ice_invoke(const ::std::string& operation,
-                    ::Ice::OperationMode mode,
-                    const ::std::vector< ::Ice::Byte>& inParams,
                     ::std::vector< ::Ice::Byte>& outParams,
-                    const ::Ice::Context& context)
+                    const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
         return ice_invoke(operation, mode, inParams, outParams, &context);
     }
 
-#ifdef ICE_CPP11
+#   ifdef ICE_CPP11_COMPILER
     ::Ice::AsyncResultPtr begin_ice_invoke(
         const ::std::string& operation,
         ::Ice::OperationMode mode,
@@ -529,7 +943,7 @@ public:
            ::IceInternal::Function<void (const ::Ice::Exception&)>(),
         const ::IceInternal::Function<void (bool)>& sent = ::IceInternal::Function<void (bool)>())
     {
-        return __begin_ice_invoke(operation, mode, inParams, 0, response, exception, sent);
+        return __begin_ice_invoke(operation, mode, inParams, &::Ice::noExplicitContext, response, exception, sent);
     }
 
     ::Ice::AsyncResultPtr begin_ice_invoke(
@@ -554,7 +968,7 @@ public:
                                                             ::IceInternal::Function<void (const ::Ice::Exception&)>(),
             const ::IceInternal::Function<void (bool)>& sent = ::IceInternal::Function<void (bool)>())
     {
-        return __begin_ice_invoke(operation, mode, inParams, 0, response, exception, sent);
+        return __begin_ice_invoke(operation, mode, inParams, &::Ice::noExplicitContext, response, exception, sent);
     }
 
     ::Ice::AsyncResultPtr begin_ice_invoke(
@@ -570,13 +984,13 @@ public:
     {
         return __begin_ice_invoke(operation, mode, inParams, &ctx, response, exception, sent);
     }
-#endif
+#   endif
 
     ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation,
                                            ::Ice::OperationMode mode,
                                            const ::std::vector< ::Ice::Byte>& inParams)
     {
-        return begin_ice_invoke(operation, mode, inParams, 0, ::IceInternal::__dummyCallback, 0);
+        return begin_ice_invoke(operation, mode, inParams, &::Ice::noExplicitContext, ::IceInternal::__dummyCallback, 0);
     }
 
     ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation,
@@ -593,7 +1007,7 @@ public:
                                            const ::Ice::CallbackPtr& __del,
                                            const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_ice_invoke(operation, mode, inParams, 0, __del, __cookie);
+        return begin_ice_invoke(operation, mode, inParams, &::Ice::noExplicitContext, __del, __cookie);
     }
 
     ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation,
@@ -612,7 +1026,7 @@ public:
                                            const ::Ice::Callback_Object_ice_invokePtr& __del,
                                            const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_ice_invoke(operation, mode, inParams, 0, __del, __cookie);
+        return begin_ice_invoke(operation, mode, inParams, &::Ice::noExplicitContext, __del, __cookie);
     }
 
     ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation,
@@ -630,16 +1044,8 @@ public:
     bool ice_invoke(const ::std::string& operation,
                     ::Ice::OperationMode mode,
                     const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>& inParams,
-                    ::std::vector< ::Ice::Byte>& outParams)
-    {
-        return ice_invoke(operation, mode, inParams, outParams, 0);
-    }
-
-    bool ice_invoke(const ::std::string& operation,
-                    ::Ice::OperationMode mode,
-                    const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>& inParams,
                     ::std::vector< ::Ice::Byte>& outParams,
-                    const ::Ice::Context& context)
+                    const ::Ice::Context& context = ::Ice::noExplicitContext)
     {
         return ice_invoke(operation, mode, inParams, outParams, &context);
     }
@@ -648,7 +1054,7 @@ public:
                                            ::Ice::OperationMode mode,
                                            const ::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>& inParams)
     {
-        return begin_ice_invoke(operation, mode, inParams, 0, ::IceInternal::__dummyCallback, 0);
+        return begin_ice_invoke(operation, mode, inParams, &::Ice::noExplicitContext, ::IceInternal::__dummyCallback, 0);
     }
 
     ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation,
@@ -666,7 +1072,7 @@ public:
                                            const ::Ice::CallbackPtr& __del,
                                            const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_ice_invoke(operation, mode, inParams, 0, __del, __cookie);
+        return begin_ice_invoke(operation, mode, inParams, &::Ice::noExplicitContext, __del, __cookie);
     }
 
     ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation,
@@ -685,7 +1091,7 @@ public:
                                            const ::Ice::Callback_Object_ice_invokePtr& __del,
                                            const ::Ice::LocalObjectPtr& __cookie = 0)
     {
-        return begin_ice_invoke(operation, mode, inParams, 0, __del, __cookie);
+        return begin_ice_invoke(operation, mode, inParams, &::Ice::noExplicitContext, __del, __cookie);
     }
 
     ::Ice::AsyncResultPtr begin_ice_invoke(const ::std::string& operation,
@@ -701,37 +1107,37 @@ public:
     bool ___end_ice_invoke(::std::pair<const ::Ice::Byte*, const ::Ice::Byte*>&, const ::Ice::AsyncResultPtr&);
 
     ::Ice::Identity ice_getIdentity() const;
-    ::Ice::ObjectPrx ice_identity(const ::Ice::Identity&) const;
+    ::Ice::ObjectPrxPtr ice_identity(const ::Ice::Identity&) const;
 
     ::Ice::Context ice_getContext() const;
-    ::Ice::ObjectPrx ice_context(const ::Ice::Context&) const;
+    ::Ice::ObjectPrxPtr ice_context(const ::Ice::Context&) const;
 
     const ::std::string& ice_getFacet() const;
-    ::Ice::ObjectPrx ice_facet(const ::std::string&) const;
+    ::Ice::ObjectPrxPtr ice_facet(const ::std::string&) const;
 
     ::std::string ice_getAdapterId() const;
-    ::Ice::ObjectPrx ice_adapterId(const ::std::string&) const;
+    ::Ice::ObjectPrxPtr ice_adapterId(const ::std::string&) const;
 
     ::Ice::EndpointSeq ice_getEndpoints() const;
-    ::Ice::ObjectPrx ice_endpoints(const ::Ice::EndpointSeq&) const;
+    ::Ice::ObjectPrxPtr ice_endpoints(const ::Ice::EndpointSeq&) const;
 
     ::Ice::Int ice_getLocatorCacheTimeout() const;
-    ::Ice::ObjectPrx ice_locatorCacheTimeout(::Ice::Int) const;
+    ::Ice::ObjectPrxPtr ice_locatorCacheTimeout(::Ice::Int) const;
 
     bool ice_isConnectionCached() const;
-    ::Ice::ObjectPrx ice_connectionCached(bool) const;
+    ::Ice::ObjectPrxPtr ice_connectionCached(bool) const;
 
     ::Ice::EndpointSelectionType ice_getEndpointSelection() const;
-    ::Ice::ObjectPrx ice_endpointSelection(::Ice::EndpointSelectionType) const;
+    ::Ice::ObjectPrxPtr ice_endpointSelection(::Ice::EndpointSelectionType) const;
 
     bool ice_isSecure() const;
-    ::Ice::ObjectPrx ice_secure(bool) const;
+    ::Ice::ObjectPrxPtr ice_secure(bool) const;
 
     ::Ice::EncodingVersion ice_getEncodingVersion() const;
-    ::Ice::ObjectPrx ice_encodingVersion(const ::Ice::EncodingVersion&) const;
+    ::Ice::ObjectPrxPtr ice_encodingVersion(const ::Ice::EncodingVersion&) const;
 
     bool ice_isPreferSecure() const;
-    ::Ice::ObjectPrx ice_preferSecure(bool) const;
+    ::Ice::ObjectPrxPtr ice_preferSecure(bool) const;
 
     ::Ice::RouterPrx ice_getRouter() const;
     ::Ice::ObjectPrx ice_router(const ::Ice::RouterPrx&) const;
@@ -764,7 +1170,7 @@ public:
 
     ::Ice::ConnectionPtr ice_getConnection();
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     ::Ice::AsyncResultPtr begin_ice_getConnection(
         const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& completed)
     {
@@ -800,7 +1206,7 @@ public:
 
     void ice_flushBatchRequests();
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     ::Ice::AsyncResultPtr begin_ice_flushBatchRequests(
         const ::IceInternal::Function<void (const ::Ice::Exception&)>& exception,
         const ::IceInternal::Function<void (bool)>& sent = ::IceInternal::Function<void (bool)>())
@@ -833,7 +1239,7 @@ public:
 
     ::Ice::Int __hash() const;
 
-    void __copyFrom(const ::Ice::ObjectPrx&);
+    void __copyFrom(const ::Ice::ObjectPrxPtr&);
 
     int __handleException(const ::Ice::Exception&, const ::IceInternal::RequestHandlerPtr&, ::Ice::OperationMode,
                           bool, int&);
@@ -861,7 +1267,7 @@ private:
                                         const ::IceInternal::CallbackBasePtr&,
                                         const ::Ice::LocalObjectPtr&);
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     ::Ice::AsyncResultPtr __begin_ice_isA(
         const ::std::string&,
         const ::Ice::Context*,
@@ -877,7 +1283,7 @@ private:
                                          const ::IceInternal::CallbackBasePtr&,
                                          const ::Ice::LocalObjectPtr&);
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     ::Ice::AsyncResultPtr __begin_ice_ping(
         const ::Ice::Context* ctx,
         const ::IceInternal::Function<void ()>& response,
@@ -894,7 +1300,7 @@ private:
                                         const ::IceInternal::CallbackBasePtr&,
                                         const ::Ice::LocalObjectPtr&);
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     ::Ice::AsyncResultPtr __begin_ice_ids(
         const ::Ice::Context*,
         const ::IceInternal::Function<void (const ::std::vector< ::std::string>&)>&,
@@ -908,7 +1314,7 @@ private:
     ::Ice::AsyncResultPtr begin_ice_id(const ::Ice::Context*,
                                        const ::IceInternal::CallbackBasePtr&,
                                        const ::Ice::LocalObjectPtr&);
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     ::Ice::AsyncResultPtr __begin_ice_id(
         const ::Ice::Context*,
         const ::IceInternal::Function<void (const ::std::string&)>&,
@@ -931,7 +1337,7 @@ private:
                                            const ::IceInternal::CallbackBasePtr&,
                                            const ::Ice::LocalObjectPtr&);
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     ::Ice::AsyncResultPtr __begin_ice_invoke(
         const ::std::string&,
         ::Ice::OperationMode,
@@ -957,7 +1363,7 @@ private:
                                            const ::IceInternal::CallbackBasePtr&,
                                            const ::Ice::LocalObjectPtr&);
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     ::Ice::AsyncResultPtr __begin_ice_invoke(
         const ::std::string&,
         ::Ice::OperationMode,
@@ -991,39 +1397,39 @@ ICE_API ::std::ostream& operator<<(::std::ostream&, const ::IceProxy::Ice::Objec
 namespace Ice
 {
 
-ICE_API bool proxyIdentityLess(const ObjectPrx&, const ObjectPrx&);
-ICE_API bool proxyIdentityEqual(const ObjectPrx&, const ObjectPrx&);
+ICE_API bool proxyIdentityLess(const ObjectPrxPtr&, const ObjectPrxPtr&);
+ICE_API bool proxyIdentityEqual(const ObjectPrxPtr&, const ObjectPrxPtr&);
 
-ICE_API bool proxyIdentityAndFacetLess(const ObjectPrx&, const ObjectPrx&);
-ICE_API bool proxyIdentityAndFacetEqual(const ObjectPrx&, const ObjectPrx&);
+ICE_API bool proxyIdentityAndFacetLess(const ObjectPrxPtr&, const ObjectPrxPtr&);
+ICE_API bool proxyIdentityAndFacetEqual(const ObjectPrxPtr&, const ObjectPrxPtr&);
 
-struct ProxyIdentityLess : std::binary_function<bool, ObjectPrx&, ObjectPrx&>
+struct ProxyIdentityLess : std::binary_function<bool, ObjectPrxPtr&, ObjectPrxPtr&>
 {
-    bool operator()(const ObjectPrx& lhs, const ObjectPrx& rhs) const
+    bool operator()(const ObjectPrxPtr& lhs, const ObjectPrxPtr& rhs) const
     {
         return proxyIdentityLess(lhs, rhs);
     }
 };
 
-struct ProxyIdentityEqual : std::binary_function<bool, ObjectPrx&, ObjectPrx&>
+struct ProxyIdentityEqual : std::binary_function<bool, ObjectPrxPtr&, ObjectPrxPtr&>
 {
-    bool operator()(const ObjectPrx& lhs, const ObjectPrx& rhs) const
+    bool operator()(const ObjectPrxPtr& lhs, const ObjectPrxPtr& rhs) const
     {
         return proxyIdentityEqual(lhs, rhs);
     }
 };
 
-struct ProxyIdentityAndFacetLess : std::binary_function<bool, ObjectPrx&, ObjectPrx&>
+struct ProxyIdentityAndFacetLess : std::binary_function<bool, ObjectPrxPtr&, ObjectPrxPtr&>
 {
-    bool operator()(const ObjectPrx& lhs, const ObjectPrx& rhs) const
+    bool operator()(const ObjectPrxPtr& lhs, const ObjectPrxPtr& rhs) const
     {
         return proxyIdentityAndFacetLess(lhs, rhs);
     }
 };
 
-struct ProxyIdentityAndFacetEqual : std::binary_function<bool, ObjectPrx&, ObjectPrx&>
+struct ProxyIdentityAndFacetEqual : std::binary_function<bool, ObjectPrxPtr&, ObjectPrxPtr&>
 {
-    bool operator()(const ObjectPrx& lhs, const ObjectPrx& rhs) const
+    bool operator()(const ObjectPrxPtr& lhs, const ObjectPrxPtr& rhs) const
     {
         return proxyIdentityAndFacetEqual(lhs, rhs);
     }
@@ -1096,7 +1502,7 @@ inline bool operator>=(const ProxyHandle<T>& lhs, const ProxyHandle<U>& rhs)
 // checkedCast and uncheckedCast functions without facet:
 //
 template<typename P> P
-checkedCastImpl(const ::Ice::ObjectPrx& b, const ::Ice::Context* context)
+checkedCastImpl(const ::Ice::ObjectPrxPtr& b, const ::Ice::Context* context)
 {
     P d = 0;
     if(b.get())
@@ -1116,7 +1522,7 @@ checkedCastImpl(const ::Ice::ObjectPrx& b, const ::Ice::Context* context)
 }
 
 template<typename P> P
-uncheckedCastImpl(const ::Ice::ObjectPrx& b)
+uncheckedCastImpl(const ::Ice::ObjectPrxPtr& b)
 {
     P d = 0;
     if(b)
@@ -1140,24 +1546,24 @@ uncheckedCastImpl(const ::Ice::ObjectPrx& b)
 //
 // Helper with type ID.
 //
-ICE_API ::Ice::ObjectPrx checkedCastImpl(const ::Ice::ObjectPrx&, const std::string&, const std::string&,
+ICE_API ::Ice::ObjectPrxPtr checkedCastImpl(const ::Ice::ObjectPrxPtr&, const std::string&, const std::string&,
                                          const ::Ice::Context*);
 
 //
-// Specializations for P = ::Ice::ObjectPrx
+// Specializations for P = ::Ice::ObjectPrxPtr
 // We have to use inline functions for broken compilers such as VC7.
 //
 
-template<> inline ::Ice::ObjectPrx
-checkedCastImpl< ::Ice::ObjectPrx>(const ::Ice::ObjectPrx& b, const std::string& f, const ::Ice::Context* context)
+template<> inline ::Ice::ObjectPrxPtr
+checkedCastImpl< ::Ice::ObjectPrxPtr>(const ::Ice::ObjectPrxPtr& b, const std::string& f, const ::Ice::Context* context)
 {
     return checkedCastImpl(b, f, "::Ice::Object", context);
 }
 
-template<> inline ::Ice::ObjectPrx
-uncheckedCastImpl< ::Ice::ObjectPrx>(const ::Ice::ObjectPrx& b, const std::string& f)
+template<> inline ::Ice::ObjectPrxPtr
+uncheckedCastImpl< ::Ice::ObjectPrxPtr>(const ::Ice::ObjectPrxPtr& b, const std::string& f)
 {
-    ::Ice::ObjectPrx d = 0;
+    ::Ice::ObjectPrxPtr d = 0;
     if(b)
     {
         d = b->ice_facet(f);
@@ -1166,12 +1572,12 @@ uncheckedCastImpl< ::Ice::ObjectPrx>(const ::Ice::ObjectPrx& b, const std::strin
 }
 
 template<typename P> P
-checkedCastImpl(const ::Ice::ObjectPrx& b, const std::string& f, const ::Ice::Context* context)
+checkedCastImpl(const ::Ice::ObjectPrxPtr& b, const std::string& f, const ::Ice::Context* context)
 {
     P d = 0;
 
     typedef typename P::element_type T;
-    ::Ice::ObjectPrx bb = checkedCastImpl(b, f, T::ice_staticId(), context);
+    ::Ice::ObjectPrxPtr bb = checkedCastImpl(b, f, T::ice_staticId(), context);
 
     if(bb)
     {
@@ -1182,14 +1588,14 @@ checkedCastImpl(const ::Ice::ObjectPrx& b, const std::string& f, const ::Ice::Co
 }
 
 template<typename P> P
-uncheckedCastImpl(const ::Ice::ObjectPrx& b, const std::string& f)
+uncheckedCastImpl(const ::Ice::ObjectPrxPtr& b, const std::string& f)
 {
     P d = 0;
     if(b)
     {
         typedef typename P::element_type T;
 
-        ::Ice::ObjectPrx bb = b->ice_facet(f);
+        ::Ice::ObjectPrxPtr bb = b->ice_facet(f);
         d = new T;
         d->__copyFrom(bb);
     }
@@ -1224,20 +1630,20 @@ uncheckedCast(const ::IceInternal::ProxyHandle<Y>& b)
 }
 
 template<typename P> inline P
-checkedCast(const ::Ice::ObjectPrx& b, const std::string& f)
+checkedCast(const ::Ice::ObjectPrxPtr& b, const std::string& f)
 {
     Ice::Context* ctx = 0;
     return ::IceInternal::checkedCastImpl<P>(b, f, ctx);
 }
 
 template<typename P> inline P
-checkedCast(const ::Ice::ObjectPrx& b, const std::string& f, const ::Ice::Context& context)
+checkedCast(const ::Ice::ObjectPrxPtr& b, const std::string& f, const ::Ice::Context& context)
 {
     return ::IceInternal::checkedCastImpl<P>(b, f, &context);
 }
 
 template<typename P> inline P
-uncheckedCast(const ::Ice::ObjectPrx& b, const std::string& f)
+uncheckedCast(const ::Ice::ObjectPrxPtr& b, const std::string& f)
 {
     return ::IceInternal::uncheckedCastImpl<P>(b, f);
 }
@@ -2448,5 +2854,6 @@ newCallback_Object_ice_flushBatchRequests(T* instance,
 }
 
 }
+#endif
 
 #endif
diff --git a/cpp/include/Ice/ProxyF.h b/cpp/include/Ice/ProxyF.h
index a310540d7ee..2f0a5a223c9 100644
--- a/cpp/include/Ice/ProxyF.h
+++ b/cpp/include/Ice/ProxyF.h
@@ -15,6 +15,7 @@
 #include <Ice/Config.h>
 #include <Ice/ProxyHandle.h>
 
+#ifndef ICE_CPP11_MAPPING // C++98 mapping
 namespace IceProxy
 {
 
@@ -71,8 +72,32 @@ namespace Ice
 {
 
 typedef IceInternal::ProxyHandle< ::IceProxy::Ice::Object> ObjectPrx;
+typedef ObjectPrx ObjectPrxPtr;
 
 }
+#else // C++11 mapping
+namespace Ice
+{
+
+class ObjectPrx;
+typedef ::std::shared_ptr<ObjectPrx> ObjectPrxPtr;
+
+}
+
+namespace IceProxy
+{
+
+namespace Ice
+{
+
+//
+// ObjectPrx alias for compatibility with C++98 mapping
+//
+typedef ::Ice::ObjectPrx Object;
 
+}
+
+}
+#endif
 
 #endif
diff --git a/cpp/include/Ice/ProxyHandle.h b/cpp/include/Ice/ProxyHandle.h
index 3d127f33494..eabf9acf003 100644
--- a/cpp/include/Ice/ProxyHandle.h
+++ b/cpp/include/Ice/ProxyHandle.h
@@ -15,6 +15,7 @@
 
 #include <iosfwd>
 
+#ifndef ICE_CPP11_MAPPING // C++98 mapping
 namespace IceInternal
 {
 
@@ -328,3 +329,5 @@ std::ostream& operator<<(std::ostream& os, ::IceInternal::ProxyHandle<Y> p)
 }
 
 #endif
+
+#endif
diff --git a/cpp/include/Ice/RequestHandlerF.h b/cpp/include/Ice/RequestHandlerF.h
index ac777d61761..7dfbe6aca72 100644
--- a/cpp/include/Ice/RequestHandlerF.h
+++ b/cpp/include/Ice/RequestHandlerF.h
@@ -16,14 +16,20 @@
 namespace IceInternal
 {
 
+class CancellationHandler;
 class RequestHandler;
-ICE_API IceUtil::Shared* upCast(RequestHandler*);
-typedef IceInternal::Handle<RequestHandler> RequestHandlerPtr;
 
-class CancellationHandler;
+#ifdef ICE_CPP11_MAPPING
+typedef ::std::shared_ptr<CancellationHandler> CancellationHandlerPtr;
+typedef ::std::shared_ptr<RequestHandler> RequestHandlerPtr;
+#else
 ICE_API IceUtil::Shared* upCast(CancellationHandler*);
 typedef IceInternal::Handle<CancellationHandler> CancellationHandlerPtr;
 
+ICE_API IceUtil::Shared* upCast(RequestHandler*);
+typedef IceInternal::Handle<RequestHandler> RequestHandlerPtr;
+#endif
+
 }
 
 #endif
diff --git a/cpp/include/Ice/ResponseHandlerF.h b/cpp/include/Ice/ResponseHandlerF.h
index 88a5c05e063..109a2697981 100644
--- a/cpp/include/Ice/ResponseHandlerF.h
+++ b/cpp/include/Ice/ResponseHandlerF.h
@@ -17,8 +17,13 @@ namespace IceInternal
 {
 
 class ResponseHandler;
+
+#ifdef ICE_CPP11_MAPPING
+typedef ::std::shared_ptr<ResponseHandler> ResponseHandlerPtr;
+#else
 ICE_API IceUtil::Shared* upCast(ResponseHandler*);
 typedef IceInternal::Handle<ResponseHandler> ResponseHandlerPtr;
+#endif
 
 }
 
diff --git a/cpp/include/Ice/SlicedData.h b/cpp/include/Ice/SlicedData.h
index 96ec59fd24c..2956e7431f2 100644
--- a/cpp/include/Ice/SlicedData.h
+++ b/cpp/include/Ice/SlicedData.h
@@ -12,6 +12,7 @@
 
 #include <Ice/SlicedDataF.h>
 #include <Ice/GCObject.h>
+#include <Ice/Value.h>
 
 namespace Ice
 {
@@ -19,7 +20,10 @@ namespace Ice
 //
 // SliceInfo encapsulates the details of a slice for an unknown class or exception type.
 //
-struct ICE_API SliceInfo : public ::IceUtil::Shared
+struct ICE_API SliceInfo
+#ifndef ICE_CPP11_MAPPING
+    : public ::IceUtil::Shared
+#endif
 {
     //
     // The Slice type ID for this slice.
@@ -39,7 +43,7 @@ struct ICE_API SliceInfo : public ::IceUtil::Shared
     //
     // The Ice objects referenced by this slice.
     //
-    ::std::vector<ObjectPtr> objects;
+    ::std::vector<ValuePtr> objects;
 
     //
     // Whether or not the slice contains optional members.
@@ -55,21 +59,30 @@ struct ICE_API SliceInfo : public ::IceUtil::Shared
 //
 // SlicedData holds the slices of unknown types.
 //
-class ICE_API SlicedData : public ::IceUtil::Shared
+class ICE_API SlicedData
+#ifndef ICE_CPP11_MAPPING
+    : public ::IceUtil::Shared
+#endif
 {
 public:
 
     SlicedData(const SliceInfoSeq&);
 
     const SliceInfoSeq slices;
-
+#ifndef ICE_CPP11_MAPPING
     void __gcVisitMembers(IceInternal::GCVisitor&);
+#endif
 };
 
 //
 // Unknown sliced object holds instance of unknown type.
 //
-class ICE_API UnknownSlicedObject : virtual public Object, private IceInternal::GCObject
+class ICE_API UnknownSlicedObject
+#ifdef ICE_CPP11_MAPPING
+    : public Value
+#else
+    : virtual public Object, private IceInternal::GCObject
+#endif
 {
 public:
 
@@ -79,13 +92,12 @@ public:
 
     SlicedDataPtr getSlicedData() const;
 
+#ifndef ICE_CPP11_MAPPING
     virtual void __gcVisitMembers(IceInternal::GCVisitor&);
+#endif
 
     virtual void __write(::IceInternal::BasicStream*) const;
     virtual void __read(::IceInternal::BasicStream*);
-    
-    using Object::__write;
-    using Object::__read;
 
 private:
 
diff --git a/cpp/include/Ice/SlicedDataF.h b/cpp/include/Ice/SlicedDataF.h
index d72444347c1..dd2d1f71277 100644
--- a/cpp/include/Ice/SlicedDataF.h
+++ b/cpp/include/Ice/SlicedDataF.h
@@ -17,17 +17,25 @@ namespace Ice
 {
 
 struct SliceInfo;
+class SlicedData;
+class UnknownSlicedObject;
+
+#ifdef ICE_CPP11_MAPPING
+typedef ::std::shared_ptr<SliceInfo> SliceInfoPtr;
+typedef ::std::shared_ptr<SlicedData> SlicedDataPtr;
+typedef ::std::shared_ptr<UnknownSlicedObject> UnknownSlicedObjectPtr;
+#else
 ICE_API IceUtil::Shared* upCast(SliceInfo*);
 typedef IceInternal::Handle<SliceInfo> SliceInfoPtr;
-typedef ::std::vector<SliceInfoPtr> SliceInfoSeq;
 
-class SlicedData;
 ICE_API IceUtil::Shared* upCast(SlicedData*);
 typedef IceInternal::Handle<SlicedData> SlicedDataPtr;
 
-class UnknownSlicedObject;
 ICE_API IceUtil::Shared* upCast(UnknownSlicedObject*);
 typedef IceInternal::Handle<UnknownSlicedObject> UnknownSlicedObjectPtr;
+#endif
+
+typedef ::std::vector<SliceInfoPtr> SliceInfoSeq;
 
 }
 
diff --git a/cpp/include/Ice/Stream.h b/cpp/include/Ice/Stream.h
index 551e55f9b70..84d58abdc10 100644
--- a/cpp/include/Ice/Stream.h
+++ b/cpp/include/Ice/Stream.h
@@ -26,7 +26,7 @@ class ICE_API ReadObjectCallback : public ::IceUtil::Shared
 {
 public:
 
-    virtual void invoke(const ObjectPtr&) = 0;
+    virtual void invoke(const ValuePtr&) = 0;
 };
 typedef IceUtil::Handle<ReadObjectCallback> ReadObjectCallbackPtr;
 
@@ -36,14 +36,18 @@ class ReadObjectCallbackI : public ReadObjectCallback
 
 public:
 
-    ReadObjectCallbackI(::IceInternal::Handle<T>& v) :
+    ReadObjectCallbackI(ICE_INTERNAL_HANDLE<T>& v) :
         _v(v)
     {
     }
 
-    virtual void invoke(const ObjectPtr& p)
+    virtual void invoke(const ValuePtr& p)
     {
+#ifdef ICE_CPP11_MAPPING
+        _v = ::std::dynamic_pointer_cast<T>(p);
+#else
         _v = ::IceInternal::Handle<T>::dynamicCast(p);
+#endif
         if(p && !_v)
         {
             IceInternal::Ex::throwUOE(T::ice_staticId(), p);
@@ -52,7 +56,7 @@ public:
 
 private:
 
-    ::IceInternal::Handle<T>& _v;
+    ICE_INTERNAL_HANDLE<T>& _v;
 };
 
 class ICE_API UserExceptionReader : public UserException
@@ -109,23 +113,33 @@ public:
     virtual Int readSize() = 0;
     virtual Int readAndCheckSeqSize(int) = 0;
 
-    virtual ObjectPrx readProxy() = 0;
+    virtual ObjectPrxPtr readProxy() = 0;
+#ifndef ICE_CPP11_MAPPING
     template<typename T> void read(IceInternal::ProxyHandle<T>& v)
+#else
+    template<typename T, typename ::std::enable_if<IsProxy<T>::value>::type* = nullptr>
+    void read(::std::shared_ptr<T>& v)
+#endif
     {
-        ObjectPrx proxy = readProxy();
+        ObjectPrxPtr proxy = readProxy();
         if(!proxy)
         {
             v = 0;
         }
         else
         {
-            v = new T;
+            v = ICE_MAKE_SHARED(T);
             v->__copyFrom(proxy);
         }
     }
 
     virtual void readObject(const ReadObjectCallbackPtr&) = 0;
+#ifndef ICE_CPP11_MAPPING
     template<typename T> void read(IceInternal::Handle<T>& v)
+#else
+    template<typename T, typename ::std::enable_if<IsValue<T>::value>::type* = nullptr>
+    void read(::std::shared_ptr<T>& v)
+#endif
     {
         readObject(new ReadObjectCallbackI<T>(v));
     }
@@ -255,17 +269,33 @@ public:
 
     virtual void writeSize(Int) = 0;
 
-    virtual void writeProxy(const ObjectPrx&) = 0;
+    virtual void writeProxy(const ObjectPrxPtr&) = 0;
+#ifndef ICE_CPP11_MAPPING
     template<typename T> void write(const IceInternal::ProxyHandle<T>& v)
     {
         writeProxy(ObjectPrx(v.get()));
     }
+#else
+    template<typename T, typename ::std::enable_if<IsProxy<T>::value>::type* = nullptr>
+    void write(const ::std::shared_ptr<T>& v)
+    {
+        writeProxy(::std::dynamic_pointer_cast<ObjectPrx>(v));
+    }
+#endif
 
-    virtual void writeObject(const ObjectPtr&) = 0;
+    virtual void writeObject(const ValuePtr&) = 0;
+#ifndef ICE_CPP11_MAPPING
     template<typename T> void write(const IceInternal::Handle<T>& v)
     {
         writeObject(ObjectPtr(v.get()));
     }
+#else
+    template<typename T, typename ::std::enable_if<IsValue<T>::value>::type* = nullptr>
+    void write(const ::std::shared_ptr<T>& v)
+    {
+        writeObject(::std::dynamic_pointer_cast<Value>(v));
+    }
+#endif
 
     virtual void writeEnum(Int v, Int maxValue)
     {
diff --git a/cpp/include/Ice/StreamHelpers.h b/cpp/include/Ice/StreamHelpers.h
index 9ffd6634b60..10bd6e723af 100644
--- a/cpp/include/Ice/StreamHelpers.h
+++ b/cpp/include/Ice/StreamHelpers.h
@@ -14,6 +14,7 @@
 #include <IceUtil/Iterator.h>
 
 #include <Ice/ObjectF.h>
+#include <Ice/Traits.h>
 
 namespace Ice
 {
@@ -233,6 +234,15 @@ struct StreamableTraits< ::std::vector<bool> >
 };
 
 
+#ifdef ICE_CPP11_MAPPING
+template<typename T>
+struct StreamableTraits<::std::shared_ptr<T>, typename ::std::enable_if<IsProxy<T>::value>::type>
+{
+    static const StreamHelperCategory helper = StreamHelperCategoryProxy;
+    static const int minWireSize = 2;
+    static const bool fixedLength = false;
+};
+#else
 template<typename T>
 struct StreamableTraits< ::IceInternal::ProxyHandle<T> >
 {
@@ -240,7 +250,17 @@ struct StreamableTraits< ::IceInternal::ProxyHandle<T> >
     static const int minWireSize = 2;
     static const bool fixedLength = false;
 };
+#endif
 
+#ifdef ICE_CPP11_MAPPING
+template<typename T>
+struct StreamableTraits<::std::shared_ptr<T>, typename ::std::enable_if<IsValue<T>::value>::type>
+{
+    static const StreamHelperCategory helper = StreamHelperCategoryClass;
+    static const int minWireSize = 1;
+    static const bool fixedLength = false;
+};
+#else
 template<typename T>
 struct StreamableTraits< ::IceInternal::Handle<T> >
 {
@@ -248,6 +268,7 @@ struct StreamableTraits< ::IceInternal::Handle<T> >
     static const int minWireSize = 1;
     static const bool fixedLength = false;
 };
+#endif
 
 //
 // StreamHelper templates used by streams to read and write data.
diff --git a/cpp/include/Ice/Traits.h b/cpp/include/Ice/Traits.h
new file mode 100644
index 00000000000..e81cffdeaa1
--- /dev/null
+++ b/cpp/include/Ice/Traits.h
@@ -0,0 +1,45 @@
+#ifndef ICE_TRAITS_H
+#define ICE_TRAITS_H
+
+#ifdef ICE_CPP11_MAPPING
+
+#include <type_traits>
+
+namespace Ice
+{
+
+class ObjectPrx;
+class Value;
+
+template<class T> using IsProxy = ::std::is_base_of<::Ice::ObjectPrx, T>;
+template<class T> using IsValue = ::std::is_base_of<::Ice::Value, T>;
+
+enum class Kind { Value, Proxy };
+
+template<typename T>
+struct TypeTraits
+{
+    constexpr static bool isKind(Kind kind)
+    {
+        switch(kind)
+        {
+            case Kind::Value:
+            {
+                return std::is_base_of<Value, T>::value;
+            }
+            case Kind::Proxy:
+            {
+                return std::is_base_of<ObjectPrx, T>::value;
+            }
+            default:
+            {
+                return false;
+            }
+        }
+    }
+};
+
+}
+#endif
+
+#endif
diff --git a/cpp/include/Ice/Value.h b/cpp/include/Ice/Value.h
new file mode 100644
index 00000000000..4d66fe4fd33
--- /dev/null
+++ b/cpp/include/Ice/Value.h
@@ -0,0 +1,62 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_VALUE_H
+#define ICE_VALUE_H
+
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+#include <Ice/ValueF.h>
+#include <Ice/StreamF.h>
+
+namespace IceInternal
+{
+
+class BasicStream;
+
+}
+
+namespace Ice
+{
+
+class ICE_API Value
+{
+public:
+    
+    virtual ~Value() = default;
+    
+    virtual void ice_preMarshal();
+    virtual void ice_postUnmarshal();
+
+    virtual void __write(IceInternal::BasicStream*) const;
+    virtual void __read(IceInternal::BasicStream*);
+    
+    virtual const std::string& ice_id() const;
+    static const std::string& ice_staticId();
+
+protected:
+    
+    virtual void __writeImpl(IceInternal::BasicStream*) const {}
+    virtual void __readImpl(IceInternal::BasicStream*) {}
+};
+
+template<typename T>
+struct ICE_API InterfaceTraits
+{    
+    static const int compactId = -1;
+    static const std::string staticId;
+};
+
+ICE_API void ice_writeObject(const OutputStreamPtr&, const ValuePtr&);
+ICE_API void ice_readObject(const InputStreamPtr&, ValuePtr&);
+
+}
+#endif // C++11 mapping end
+
+#endif
diff --git a/cpp/include/Ice/ValueF.h b/cpp/include/Ice/ValueF.h
new file mode 100644
index 00000000000..d441f6f096b
--- /dev/null
+++ b/cpp/include/Ice/ValueF.h
@@ -0,0 +1,34 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_VALUE_F_H
+#define ICE_VALUE_F_H
+
+#include <IceUtil/Shared.h>
+#include <Ice/Handle.h>
+#include <Ice/ObjectF.h>
+
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+namespace Ice
+{
+
+class Value;
+typedef ::std::shared_ptr< ::Ice::Value> ValuePtr;
+ICE_API void __patch(ValuePtr&, const ValuePtr&);
+
+}
+#else // C++98 mapping
+//
+// Define value as an alias to Object
+//
+//typedef ::Ice::Object Value;
+//typedef ::Ice::ObjectPtr ValuePtr;
+#endif
+
+#endif
diff --git a/cpp/include/IceSSL/Plugin.h b/cpp/include/IceSSL/Plugin.h
index bf773f143d1..0578f689fbf 100644
--- a/cpp/include/IceSSL/Plugin.h
+++ b/cpp/include/IceSSL/Plugin.h
@@ -164,14 +164,16 @@ private:
 // Forward declaration.
 //
 class Certificate;
-typedef IceUtil::Handle<Certificate> CertificatePtr;
+ICE_DEFINE_PTR(CertificatePtr, Certificate);
 
 //
 // A representation of a PublicKey.
 //
-class ICE_SSL_API PublicKey : public IceUtil::Shared
+class ICE_SSL_API PublicKey : public ICE_ENABLE_SHARED_FROM_THIS(PublicKey)
 {
 public:
+    
+    PublicKey(const CertificatePtr&, KeyRef);
 
     ~PublicKey();
 
@@ -186,14 +188,13 @@ public:
 
 private:
 
-    PublicKey(const CertificatePtr&, KeyRef);
     friend class Certificate;
 
     CertificatePtr _cert;
     KeyRef _key;
 
 };
-typedef IceUtil::Handle<PublicKey> PublicKeyPtr;
+ICE_DEFINE_PTR(PublicKeyPtr, PublicKey);
 
 //
 // This class represents a DistinguishedName, similar to the Java
@@ -266,7 +267,7 @@ private:
 // This convenience class is a wrapper around a native certificate.
 // The interface is inspired by java.security.cert.X509Certificate.
 //
-class ICE_SSL_API Certificate : public IceUtil::Shared
+class ICE_SSL_API Certificate : public ICE_ENABLE_SHARED_FROM_THIS(Certificate)
 {
 public:
 
@@ -456,7 +457,7 @@ public:
     //
     std::vector<CertificatePtr> nativeCerts;
 };
-typedef IceUtil::Handle<NativeConnectionInfo> NativeConnectionInfoPtr;
+ICE_DEFINE_PTR(NativeConnectionInfoPtr, NativeConnectionInfo);
 
 //
 // WSSNativeConnectionInfo is an extension of IceSSL::WSSConnectionInfo
@@ -473,13 +474,13 @@ public:
     //
     std::vector<CertificatePtr> nativeCerts;
 };
-typedef IceUtil::Handle<WSSNativeConnectionInfo> WSSNativeConnectionInfoPtr;
+ICE_DEFINE_PTR(WSSNativeConnectionInfoPtr, WSSNativeConnectionInfo);
 
 //
 // An application can customize the certificate verification process
 // by implementing the CertificateVerifier interface.
 //
-class ICE_SSL_API CertificateVerifier : public IceUtil::Shared
+class ICE_SSL_API CertificateVerifier : public ICE_ENABLE_SHARED_FROM_THIS(CertificateVerifier)
 {
 public:
 
@@ -489,7 +490,7 @@ public:
     //
     virtual bool verify(const NativeConnectionInfoPtr&) = 0;
 };
-typedef IceUtil::Handle<CertificateVerifier> CertificateVerifierPtr;
+ICE_DEFINE_PTR(CertificateVerifierPtr, CertificateVerifier);
 
 //
 // In order to read an encrypted file, such as one containing a
@@ -506,7 +507,7 @@ typedef IceUtil::Handle<CertificateVerifier> CertificateVerifierPtr;
 // IceSSL.DelayInit=1), configure the PasswordPrompt, then manually
 // initialize the plug-in.
 //
-class ICE_SSL_API PasswordPrompt : public IceUtil::Shared
+class ICE_SSL_API PasswordPrompt : public ICE_ENABLE_SHARED_FROM_THIS(PasswordPrompt)
 {
 public:
 
@@ -517,7 +518,7 @@ public:
     //
     virtual std::string getPassword() = 0;
 };
-typedef IceUtil::Handle<PasswordPrompt> PasswordPromptPtr;
+ICE_DEFINE_PTR(PasswordPromptPtr, PasswordPrompt);
 
 class ICE_SSL_API Plugin : public Ice::Plugin
 {
@@ -557,7 +558,7 @@ public:
     virtual SSL_CTX* getContext() = 0;
 #endif
 };
-typedef IceUtil::Handle<Plugin> PluginPtr;
+ICE_DEFINE_PTR(PluginPtr, Plugin);
 
 }
 
diff --git a/cpp/include/IceUtil/Atomic.h b/cpp/include/IceUtil/Atomic.h
index dcf705bb612..2ed19c2bc7d 100644
--- a/cpp/include/IceUtil/Atomic.h
+++ b/cpp/include/IceUtil/Atomic.h
@@ -10,12 +10,12 @@
 #ifndef ICE_UTIL_ATOMIC_H
 #define ICE_UTIL_ATOMIC_H
 
-#if ((defined(ICE_CPP11) && defined(_MSC_VER) && (_MSC_VER > 1600)) || \
-     (defined(ICE_CPP11) && !defined(_MSC_VER)))
-#   define ICE_CPP11_HAS_ATOMIC
+#if ((defined(ICE_CPP11_COMPILER) && defined(_MSC_VER) && (_MSC_VER > 1600)) || \
+     (defined(ICE_CPP11_COMPILER) && !defined(_MSC_VER)))
+#   define ICE_CPP11_COMPILER_HAS_ATOMIC
 #endif
 
-#if defined(ICE_CPP11_HAS_ATOMIC)
+#if defined(ICE_CPP11_COMPILER_HAS_ATOMIC)
 #   include <atomic>
 #elif defined(ICE_USE_MUTEX_SHARED)
 
@@ -45,7 +45,7 @@
 namespace IceUtilInternal
 {
 
-#ifdef ICE_CPP11_HAS_ATOMIC
+#ifdef ICE_CPP11_COMPILER_HAS_ATOMIC
 typedef std::atomic<int> Atomic;
 #else
 
diff --git a/cpp/include/IceUtil/Config.h b/cpp/include/IceUtil/Config.h
index c656374d1f9..7f0aebb879c 100644
--- a/cpp/include/IceUtil/Config.h
+++ b/cpp/include/IceUtil/Config.h
@@ -57,11 +57,18 @@
 #if (__cplusplus >= 201103) || \
     ((defined(__GNUC__) && defined(__GXX_EXPERIMENTAL_CXX0X__) && ((__GNUC__* 100) + __GNUC_MINOR__) >= 405)) || \
     (defined(_MSC_VER) && (_MSC_VER >= 1600))
-#   define ICE_CPP11
+#   define ICE_CPP11_COMPILER
+#endif
+
+//
+// Check C++11 compiler is used when building the C++11 mapping
+//
+#if defined(ICE_CPP11_MAPPING) && !defined(ICE_CPP11_COMPILER)
+#   error "you need a C++11 capble compiler to use C++11 mapping"
 #endif
 
 
-#if defined(ICE_CPP11) && (!defined(_MSC_VER) || (_MSC_VER >= 1900))
+#if defined(ICE_CPP11_COMPILER) && (!defined(_MSC_VER) || (_MSC_VER >= 1900))
 #   define ICE_NOEXCEPT noexcept
 #   define ICE_NOEXCEPT_FALSE noexcept(false)
 #else
@@ -242,4 +249,39 @@ typedef long long Int64;
 #define ICE_STRING_VERSION "3.7.0" // "A.B.C", with A=major, B=minor, C=patch
 #define ICE_INT_VERSION 30700      // AABBCC, with AA=major, BB=minor, CC=patch
 
+//
+// Macros to facilitate C++98 -> C++11 transition
+//
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+#   include <memory>
+#   include <future>
+#   define ICE_HANDLE ::std::shared_ptr
+#   define ICE_INTERNAL_HANDLE ::std::shared_ptr
+#   define ICE_PROXY_HANDLE ::std::shared_ptr
+#   define ICE_MAKE_SHARED(T, ...) ::std::make_shared<T>(__VA_ARGS__)
+#   define ICE_DEFINE_PTR(TPtr, T) typedef ::std::shared_ptr<T> TPtr
+#   define ICE_ENUM(CLASS,ENUMERATOR) CLASS::ENUMERATOR
+#   define ICE_NULLPTR nullptr
+#   define ICE_DYNAMIC_CAST(T,V) ::std::dynamic_pointer_cast<T>(V)
+#   define ICE_ENABLE_SHARED_FROM_THIS(T) ::std::enable_shared_from_this<T>
+#   define ICE_SHARED_FROM_THIS shared_from_this()
+#   define ICE_CHECKED_CAST(T,V) Ice::checkedCast<T>(V)
+#   define ICE_UNCHECKED_CAST(T,V) Ice::uncheckedCast<T>(V)
+#   define ICE_OBJECT_FACTORY ::std::function<::Ice::ValuePtr (const std::string& type)>
+#else // C++98 mapping
+#   define ICE_HANDLE ::IceUtil::Handle
+#   define ICE_INTERNAL_HANDLE ::IceInternal::Handle
+#   define ICE_PROXY_HANDLE ::IceInternal::ProxyHandle
+#   define ICE_MAKE_SHARED(T, ...) new T(__VA_ARGS__)
+#   define ICE_DEFINE_PTR(TPtr, T) typedef ::IceUtil::Handle<T> TPtr
+#   define ICE_ENUM(CLASS,ENUMERATOR) ENUMERATOR
+#   define ICE_NULLPTR 0
+#   define ICE_DYNAMIC_CAST(T,V) T##Ptr::dynamicCast(V)
+#   define ICE_ENABLE_SHARED_FROM_THIS(T) virtual ::IceUtil::Shared
+#   define ICE_SHARED_FROM_THIS this
+#   define ICE_CHECKED_CAST(T,V) T::checkedCast(V)
+#   define ICE_UNCHECKED_CAST(T,V) T::uncheckedCast(V)
+#   define ICE_OBJECT_FACTORY ::Ice::ObjectFactoryPtr
+#endif
+
 #endif
diff --git a/cpp/include/IceUtil/Timer.h b/cpp/include/IceUtil/Timer.h
index fdaab7fe473..9457730abf6 100644
--- a/cpp/include/IceUtil/Timer.h
+++ b/cpp/include/IceUtil/Timer.h
@@ -28,7 +28,10 @@ typedef IceUtil::Handle<Timer> TimerPtr;
 // Extend the TimerTask class and override the runTimerTask() method to execute
 // code at a specific time or repeatedly.
 //
-class ICE_UTIL_API TimerTask : virtual public IceUtil::Shared
+class ICE_UTIL_API TimerTask
+#ifndef ICE_CPP11_MAPPING
+    : virtual public IceUtil::Shared
+#endif
 {
 public:
 
@@ -36,7 +39,7 @@ public:
 
     virtual void runTimerTask() = 0;
 };
-typedef IceUtil::Handle<TimerTask> TimerTaskPtr;
+ICE_DEFINE_PTR(TimerTaskPtr, TimerTask);
 
 //
 // The timer class is used to schedule tasks for one-time execution or
diff --git a/cpp/include/Slice/CPlusPlusUtil.h b/cpp/include/Slice/CPlusPlusUtil.h
index 9338bfe32cd..6f25e95ea9c 100644
--- a/cpp/include/Slice/CPlusPlusUtil.h
+++ b/cpp/include/Slice/CPlusPlusUtil.h
@@ -32,15 +32,17 @@ const int TypeContextInParam = 1;
 const int TypeContextAMIEnd = 2;
 const int TypeContextAMIPrivateEnd = 4;
 const int TypeContextAMICallPrivateEnd = 8;
-
 const int TypeContextUseWstring = 16;
+const int TypeContextReadClosure = 32;
+
+SLICE_API bool isMovable(const TypePtr&);
 
-SLICE_API std::string typeToString(const TypePtr&, const StringList& = StringList(), int = 0);
-SLICE_API std::string typeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0);
-SLICE_API std::string returnTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0);
-SLICE_API std::string inputTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0);
-SLICE_API std::string outputTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0);
-SLICE_API std::string operationModeToString(Operation::Mode);
+SLICE_API std::string typeToString(const TypePtr&, const StringList& = StringList(), int = 0, bool = false);
+SLICE_API std::string typeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0, bool = false);
+SLICE_API std::string returnTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0, bool = false);
+SLICE_API std::string inputTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0, bool = false);
+SLICE_API std::string outputTypeToString(const TypePtr&, bool, const StringList& = StringList(), int = 0, bool = false);
+SLICE_API std::string operationModeToString(Operation::Mode, bool cpp11 = false);
 SLICE_API std::string opFormatTypeToString(const OperationPtr&);
 
 SLICE_API std::string fixKwd(const std::string&);
@@ -51,11 +53,13 @@ SLICE_API void writeMarshalUnmarshalCode(::IceUtilInternal::Output&, const TypeP
 
 SLICE_API void writeMarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0);
 SLICE_API void writeUnmarshalCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0);
-SLICE_API void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0);
+SLICE_API void writeAllocateCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool, int = 0, bool = false);
 
 SLICE_API std::string getEndArg(const TypePtr&, const StringList&, const std::string&);
 SLICE_API void writeEndCode(::IceUtilInternal::Output&, const ParamDeclList&, const OperationPtr&, bool = false);
 
+SLICE_API bool findMetaData(const std::string&, const ClassDeclPtr&, std::string&);
+SLICE_API bool findMetaData(const std::string&, const StringList&, std::string&);
 SLICE_API std::string findMetaData(const StringList&, int = 0);
 SLICE_API bool inWstringModule(const SequencePtr&);
 
diff --git a/cpp/include/Slice/Parser.h b/cpp/include/Slice/Parser.h
index d3b507d790a..b2854910d67 100644
--- a/cpp/include/Slice/Parser.h
+++ b/cpp/include/Slice/Parser.h
@@ -344,7 +344,8 @@ public:
         KindString,
         KindObject,
         KindObjectProxy,
-        KindLocalObject
+        KindLocalObject,
+        KindValue
     };
 
     virtual bool isLocal() const;
@@ -478,6 +479,9 @@ public:
     bool hasOnlyDictionaries(DictionaryList&) const;
     bool hasClassDecls() const;
     bool hasClassDefs() const;
+    bool hasLocalClassDefs() const;
+    bool hasNonLocalInterfaceDefs() const;
+    bool hasValueDefs() const;
     bool hasOnlyClassDecls() const;
     bool hasAbstractClassDefs() const;
     bool hasNonLocalDataOnlyClasses() const;
diff --git a/cpp/src/Glacier2/.depend.mak b/cpp/src/Glacier2/.depend.mak
index d4a270c603d..c404b93e827 100755
--- a/cpp/src/Glacier2/.depend.mak
+++ b/cpp/src/Glacier2/.depend.mak
@@ -26,6 +26,7 @@ Blobject.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -34,6 +35,7 @@ Blobject.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -74,7 +76,7 @@ Blobject.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -88,6 +90,7 @@ Blobject.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -99,7 +102,6 @@ Blobject.obj: \
     "$(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" \
@@ -122,7 +124,6 @@ Blobject.obj: \
     "$(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" \
@@ -161,6 +162,7 @@ ClientBlobject.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -169,6 +171,7 @@ ClientBlobject.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -209,7 +212,7 @@ ClientBlobject.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -223,6 +226,7 @@ ClientBlobject.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -234,7 +238,6 @@ ClientBlobject.obj: \
     "$(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" \
@@ -257,7 +260,6 @@ ClientBlobject.obj: \
     "$(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" \
@@ -295,6 +297,7 @@ FilterI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -303,6 +306,7 @@ FilterI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -337,7 +341,7 @@ FilterI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -346,6 +350,7 @@ FilterI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -365,7 +370,6 @@ FilterI.obj: \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Glacier2\Config.h" \
 
@@ -383,6 +387,7 @@ FilterManager.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -391,6 +396,7 @@ FilterManager.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -425,7 +431,7 @@ FilterManager.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -434,6 +440,7 @@ FilterManager.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -473,7 +480,6 @@ FilterManager.obj: \
     "$(includedir)\Ice\RemoteLogger.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\CommunicatorAsync.h" \
     "$(includedir)\Ice\ObjectAdapter.h" \
     "$(includedir)\Ice\Endpoint.h" \
@@ -489,7 +495,6 @@ FilterManager.obj: \
     "$(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" \
@@ -534,6 +539,7 @@ Glacier2Router.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -542,6 +548,7 @@ Glacier2Router.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -578,7 +585,7 @@ Glacier2Router.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -592,6 +599,7 @@ Glacier2Router.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -603,7 +611,6 @@ Glacier2Router.obj: \
     "$(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" \
@@ -626,7 +633,6 @@ Glacier2Router.obj: \
     "$(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" \
@@ -676,6 +682,7 @@ Instance.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -684,6 +691,7 @@ Instance.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -716,7 +724,7 @@ Instance.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -730,6 +738,7 @@ Instance.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -741,7 +750,6 @@ Instance.obj: \
     "$(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" \
@@ -764,7 +772,6 @@ Instance.obj: \
     "$(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" \
@@ -809,6 +816,7 @@ InstrumentationI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -817,6 +825,7 @@ InstrumentationI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -852,7 +861,7 @@ InstrumentationI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -862,13 +871,13 @@ InstrumentationI.obj: \
     "$(includedir)\Ice\Metrics.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\MetricsAdminI.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
@@ -915,6 +924,7 @@ ProxyVerifier.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -923,6 +933,7 @@ ProxyVerifier.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -963,7 +974,7 @@ ProxyVerifier.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -977,6 +988,7 @@ ProxyVerifier.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -988,7 +1000,6 @@ ProxyVerifier.obj: \
     "$(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" \
@@ -1011,7 +1022,6 @@ ProxyVerifier.obj: \
     "$(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" \
@@ -1046,6 +1056,7 @@ RequestQueue.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1054,6 +1065,7 @@ RequestQueue.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1086,7 +1098,7 @@ RequestQueue.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1100,6 +1112,7 @@ RequestQueue.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1111,7 +1124,6 @@ RequestQueue.obj: \
     "$(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" \
@@ -1134,7 +1146,6 @@ RequestQueue.obj: \
     "$(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" \
@@ -1171,6 +1182,7 @@ RouterI.obj: \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1179,6 +1191,7 @@ RouterI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1213,7 +1226,7 @@ RouterI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1236,6 +1249,7 @@ RouterI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1247,7 +1261,6 @@ RouterI.obj: \
     "$(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" \
@@ -1270,7 +1283,6 @@ RouterI.obj: \
     "$(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" \
@@ -1312,6 +1324,7 @@ RoutingTable.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1320,6 +1333,7 @@ RoutingTable.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1360,7 +1374,7 @@ RoutingTable.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1374,6 +1388,7 @@ RoutingTable.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1385,7 +1400,6 @@ RoutingTable.obj: \
     "$(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" \
@@ -1408,7 +1422,6 @@ RoutingTable.obj: \
     "$(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" \
@@ -1438,6 +1451,7 @@ ServerBlobject.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1446,6 +1460,7 @@ ServerBlobject.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1486,7 +1501,7 @@ ServerBlobject.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1500,6 +1515,7 @@ ServerBlobject.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1511,7 +1527,6 @@ ServerBlobject.obj: \
     "$(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" \
@@ -1534,7 +1549,6 @@ ServerBlobject.obj: \
     "$(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" \
@@ -1580,6 +1594,7 @@ SessionRouterI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1588,6 +1603,7 @@ SessionRouterI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1620,7 +1636,7 @@ SessionRouterI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1634,6 +1650,7 @@ SessionRouterI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1645,7 +1662,6 @@ SessionRouterI.obj: \
     "$(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" \
@@ -1668,7 +1684,6 @@ SessionRouterI.obj: \
     "$(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" \
@@ -1714,6 +1729,7 @@ Instrumentation.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1722,6 +1738,7 @@ Instrumentation.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Instrumentation.h" \
     "$(includedir)\Ice\EndpointF.h" \
@@ -1742,7 +1759,7 @@ Instrumentation.obj: \
     "$(includedir)\IceUtil\Time.h" \
     "$(includedir)\IceUtil\MutexProtocol.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
diff --git a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak
index e2a6aa1d08e..47e047f82d4 100755
--- a/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak
+++ b/cpp/src/Glacier2CryptPermissionsVerifier/.depend.mak
@@ -13,6 +13,7 @@ CryptPermissionsVerifierI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -21,6 +22,7 @@ CryptPermissionsVerifierI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -55,7 +57,7 @@ CryptPermissionsVerifierI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -64,13 +66,13 @@ CryptPermissionsVerifierI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -118,7 +120,6 @@ CryptPermissionsVerifierI.obj: \
     "$(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" \
diff --git a/cpp/src/Glacier2Lib/.depend.mak b/cpp/src/Glacier2Lib/.depend.mak
index 76443d62b0c..2617d2afe55 100755
--- a/cpp/src/Glacier2Lib/.depend.mak
+++ b/cpp/src/Glacier2Lib/.depend.mak
@@ -52,6 +52,7 @@ Application.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -60,6 +61,7 @@ Application.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -100,7 +102,7 @@ Application.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -114,6 +116,7 @@ Application.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -125,7 +128,6 @@ Application.obj: \
     "$(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" \
@@ -147,7 +149,6 @@ Application.obj: \
     "$(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" \
@@ -181,6 +182,7 @@ NullPermissionsVerifier.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -189,6 +191,7 @@ NullPermissionsVerifier.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -223,7 +226,7 @@ NullPermissionsVerifier.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -232,13 +235,13 @@ NullPermissionsVerifier.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -283,7 +286,6 @@ NullPermissionsVerifier.obj: \
     "$(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" \
@@ -318,6 +320,7 @@ SessionHelper.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -326,6 +329,7 @@ SessionHelper.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -353,7 +357,7 @@ SessionHelper.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -369,6 +373,7 @@ SessionHelper.obj: \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -391,7 +396,6 @@ SessionHelper.obj: \
     "$(includedir)\Ice\RemoteLogger.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\CommunicatorAsync.h" \
     "$(includedir)\Ice\ServantLocator.h" \
     "$(includedir)\Ice\SlicedData.h" \
@@ -406,7 +410,6 @@ SessionHelper.obj: \
     "$(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" \
@@ -440,6 +443,7 @@ Metrics.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -448,6 +452,7 @@ Metrics.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -482,7 +487,7 @@ Metrics.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -491,13 +496,13 @@ Metrics.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Metrics.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -522,6 +527,7 @@ PermissionsVerifierF.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -530,6 +536,7 @@ PermissionsVerifierF.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -564,7 +571,7 @@ PermissionsVerifierF.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -586,6 +593,7 @@ PermissionsVerifier.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -594,6 +602,7 @@ PermissionsVerifier.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -628,7 +637,7 @@ PermissionsVerifier.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -637,13 +646,13 @@ PermissionsVerifier.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -669,6 +678,7 @@ Router.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -677,6 +687,7 @@ Router.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -711,7 +722,7 @@ Router.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -720,6 +731,7 @@ Router.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -727,7 +739,6 @@ Router.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Router.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Glacier2\Session.h" \
@@ -756,6 +767,7 @@ RouterF.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -764,6 +776,7 @@ RouterF.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -798,7 +811,7 @@ RouterF.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -820,6 +833,7 @@ Session.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -828,6 +842,7 @@ Session.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -862,7 +877,7 @@ Session.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -871,13 +886,13 @@ Session.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -903,6 +918,7 @@ SSLInfo.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -911,6 +927,7 @@ SSLInfo.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -931,7 +948,7 @@ SSLInfo.obj: \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
diff --git a/cpp/src/Ice/.depend.mak b/cpp/src/Ice/.depend.mak
index 00b45064bf5..f858d5d4a32 100755
--- a/cpp/src/Ice/.depend.mak
+++ b/cpp/src/Ice/.depend.mak
@@ -7,7 +7,7 @@ Communicator.h: \
     "$(slicedir)/Ice/LoggerF.ice" \
     "$(slicedir)/Ice/InstrumentationF.ice" \
     "$(slicedir)/Ice/ObjectAdapterF.ice" \
-    "$(slicedir)/Ice/ObjectFactoryF.ice" \
+    "$(slicedir)/Ice/ObjectFactory.ice" \
     "$(slicedir)/Ice/RouterF.ice" \
     "$(slicedir)/Ice/LocatorF.ice" \
     "$(slicedir)/Ice/PluginF.ice" \
@@ -95,7 +95,7 @@ LocalException.h: \
 Locator.h: \
     "$(slicedir)\Ice\Locator.ice" \
     "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/ProcessF.ice"
+    "$(slicedir)/Ice/Process.ice"
 
 LocatorF.h: \
     "$(slicedir)\Ice\LocatorF.ice"
@@ -128,9 +128,6 @@ ObjectAdapterF.h: \
 ObjectFactory.h: \
     "$(slicedir)\Ice\ObjectFactory.ice"
 
-ObjectFactoryF.h: \
-    "$(slicedir)\Ice\ObjectFactoryF.ice"
-
 Plugin.h: \
     "$(slicedir)\Ice\Plugin.ice" \
     "$(slicedir)/Ice/LoggerF.ice" \
@@ -206,6 +203,7 @@ Acceptor.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -214,6 +212,7 @@ Acceptor.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -248,7 +247,7 @@ Acceptor.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -283,6 +282,7 @@ ACM.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -291,6 +291,7 @@ ACM.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\Ice\ProxyFactoryF.h" \
     "$(includedir)\Ice\ConnectionIF.h" \
@@ -318,7 +319,7 @@ ACM.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -354,6 +355,7 @@ ACM.obj: \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
@@ -398,6 +400,7 @@ Application.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -406,6 +409,7 @@ Application.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -446,7 +450,7 @@ Application.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -460,6 +464,7 @@ Application.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -471,7 +476,6 @@ Application.obj: \
     "$(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" \
@@ -493,7 +497,6 @@ Application.obj: \
     "$(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" \
@@ -533,12 +536,14 @@ AsyncResult.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -557,7 +562,7 @@ AsyncResult.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -615,6 +620,7 @@ AsyncResult.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -659,6 +665,7 @@ BasicStream.obj: \
     "$(includedir)\Ice\IncomingAsyncF.h" \
     "$(includedir)\Ice\Current.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -667,6 +674,7 @@ BasicStream.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -674,7 +682,7 @@ BasicStream.obj: \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -738,6 +746,7 @@ BasicStream.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -747,7 +756,6 @@ BasicStream.obj: \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "ObjectFactoryManager.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
@@ -787,6 +795,7 @@ BatchRequestQueue.obj: \
     "$(includedir)\Ice\IncomingAsyncF.h" \
     "$(includedir)\Ice\Current.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -795,6 +804,7 @@ BatchRequestQueue.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -802,7 +812,7 @@ BatchRequestQueue.obj: \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -858,6 +868,7 @@ BatchRequestQueue.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -881,6 +892,7 @@ Buffer.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -889,6 +901,7 @@ Buffer.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -928,12 +941,14 @@ CollocatedRequestHandler.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -949,7 +964,7 @@ CollocatedRequestHandler.obj: \
     "$(includedir)\Ice\Current.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1007,6 +1022,7 @@ CollocatedRequestHandler.obj: \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
@@ -1055,6 +1071,7 @@ CommunicatorI.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1063,6 +1080,7 @@ CommunicatorI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1090,7 +1108,7 @@ CommunicatorI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1106,6 +1124,7 @@ CommunicatorI.obj: \
     "$(includedir)\Ice\Communicator.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1157,6 +1176,7 @@ CommunicatorI.obj: \
     "$(includedir)\Ice\ConnectionAsync.h" \
     "AcceptorF.h" \
     "EndpointI.h" \
+    "$(includedir)\Ice\Comparable.h" \
     "ReferenceFactory.h" \
     "Reference.h" \
     "BatchRequestQueue.h" \
@@ -1196,6 +1216,7 @@ ConnectionFactory.obj: \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1204,6 +1225,7 @@ ConnectionFactory.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1236,7 +1258,7 @@ ConnectionFactory.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1272,6 +1294,7 @@ ConnectionFactory.obj: \
     "RouterInfoF.h" \
     "EndpointI.h" \
     "$(includedir)\Ice\InstrumentationF.h" \
+    "$(includedir)\Ice\Comparable.h" \
     "Instance.h" \
     "$(includedir)\IceUtil\RecMutex.h" \
     "DefaultsAndOverridesF.h" \
@@ -1292,6 +1315,7 @@ ConnectionFactory.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\LoggerUtil.h" \
@@ -1315,6 +1339,7 @@ ConnectionFactory.obj: \
     "BatchRequestQueue.h" \
     "SharedContext.h" \
     "RouterInfo.h" \
+    "$(includedir)\Ice\Router.h" \
     "$(includedir)\Ice\Functional.h" \
     "$(includedir)\IceUtil\Functional.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
@@ -1347,6 +1372,7 @@ ConnectionI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1355,6 +1381,7 @@ ConnectionI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1381,7 +1408,7 @@ ConnectionI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1436,6 +1463,7 @@ ConnectionI.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\LoggerUtil.h" \
@@ -1494,12 +1522,14 @@ ConnectionRequestHandler.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1522,7 +1552,7 @@ ConnectionRequestHandler.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1542,6 +1572,7 @@ ConnectionRequestHandler.obj: \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1575,6 +1606,8 @@ ConnectionRequestHandler.obj: \
     "ACM.h" \
     "$(includedir)\Ice\ACMF.h" \
     "RouterInfo.h" \
+    "$(includedir)\Ice\Router.h" \
+    "$(includedir)\Ice\Comparable.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
 
@@ -1626,12 +1659,14 @@ ConnectRequestHandler.obj: \
     "$(includedir)\Ice\RouterF.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\Ice\ProxyFactoryF.h" \
     "$(includedir)\Ice\EndpointF.h" \
@@ -1654,7 +1689,7 @@ ConnectRequestHandler.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1670,6 +1705,7 @@ ConnectRequestHandler.obj: \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1678,6 +1714,8 @@ ConnectRequestHandler.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "RouterInfo.h" \
+    "$(includedir)\Ice\Router.h" \
+    "$(includedir)\Ice\Comparable.h" \
     "ConnectionRequestHandler.h" \
     "RequestHandlerFactory.h" \
     "Instance.h" \
@@ -1743,6 +1781,7 @@ DefaultsAndOverrides.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1751,6 +1790,7 @@ DefaultsAndOverrides.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1785,7 +1825,7 @@ DefaultsAndOverrides.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1802,6 +1842,7 @@ DefaultsAndOverrides.obj: \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1829,6 +1870,7 @@ DeprecatedStringConverter.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1837,6 +1879,7 @@ DeprecatedStringConverter.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1877,7 +1920,7 @@ DeprecatedStringConverter.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1915,6 +1958,7 @@ DeprecatedStringConverter.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1942,6 +1986,7 @@ DispatchInterceptor.obj: \
     "$(includedir)\Ice\IncomingAsyncF.h" \
     "$(includedir)\Ice\Current.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1950,6 +1995,7 @@ DispatchInterceptor.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -1965,7 +2011,7 @@ DispatchInterceptor.obj: \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2011,6 +2057,7 @@ EndpointFactory.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2019,6 +2066,7 @@ EndpointFactory.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -2070,7 +2118,7 @@ EndpointFactory.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2097,6 +2145,7 @@ EndpointFactory.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -2127,6 +2176,7 @@ EndpointFactoryManager.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2135,6 +2185,7 @@ EndpointFactoryManager.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Version.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -2160,7 +2211,7 @@ EndpointFactoryManager.obj: \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2213,6 +2264,7 @@ EndpointFactoryManager.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -2240,6 +2292,7 @@ EndpointI.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2248,6 +2301,7 @@ EndpointI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Version.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -2286,6 +2340,7 @@ EventHandler.obj: \
     "$(includedir)\Ice\IncomingAsyncF.h" \
     "$(includedir)\Ice\Current.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2294,6 +2349,7 @@ EventHandler.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -2301,7 +2357,7 @@ EventHandler.obj: \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2363,6 +2419,7 @@ EventHandler.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -2380,6 +2437,7 @@ Exception.obj: \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\IceUtil\Shared.h" \
     "$(includedir)\IceUtil\Atomic.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\StreamF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
@@ -2390,6 +2448,7 @@ Exception.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -2429,7 +2488,7 @@ Exception.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2442,6 +2501,7 @@ Exception.obj: \
     "$(includedir)\Ice\SlicedData.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Stream.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
 
@@ -2460,12 +2520,13 @@ FactoryTable.obj: \
     "$(includedir)\IceUtil\Atomic.h" \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2474,10 +2535,10 @@ FactoryTable.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
 
 FactoryTableInit.obj: \
 	FactoryTableInit.cpp \
@@ -2495,12 +2556,13 @@ FactoryTableInit.obj: \
     "$(includedir)\IceUtil\Atomic.h" \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2509,11 +2571,11 @@ FactoryTableInit.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
 
 GCObject.obj: \
@@ -2538,6 +2600,7 @@ GCObject.obj: \
     "$(includedir)\Ice\IncomingAsyncF.h" \
     "$(includedir)\Ice\Current.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2546,6 +2609,7 @@ GCObject.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -2580,6 +2644,7 @@ HttpParser.obj: \
     "$(includedir)\Ice\IncomingAsyncF.h" \
     "$(includedir)\Ice\Current.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2588,6 +2653,7 @@ HttpParser.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -2595,7 +2661,7 @@ HttpParser.obj: \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2621,6 +2687,7 @@ ImplicitContextI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2629,6 +2696,7 @@ ImplicitContextI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\Identity.h" \
@@ -2649,7 +2717,7 @@ ImplicitContextI.obj: \
     "$(includedir)\IceUtil\Time.h" \
     "$(includedir)\IceUtil\MutexProtocol.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2677,12 +2745,14 @@ Incoming.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -2701,7 +2771,7 @@ Incoming.obj: \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2781,6 +2851,7 @@ Incoming.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\LoggerUtil.h" \
@@ -2809,12 +2880,14 @@ IncomingAsync.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -2832,7 +2905,7 @@ IncomingAsync.obj: \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2907,6 +2980,7 @@ IncomingAsync.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "ReplyStatus.h" \
@@ -2939,6 +3013,7 @@ Initialize.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2947,6 +3022,7 @@ Initialize.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -2974,7 +3050,7 @@ Initialize.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2990,6 +3066,7 @@ Initialize.obj: \
     "$(includedir)\Ice\Communicator.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -3060,6 +3137,7 @@ Instance.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -3068,6 +3146,7 @@ Instance.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -3103,7 +3182,7 @@ Instance.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -3133,6 +3212,7 @@ Instance.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -3142,19 +3222,18 @@ Instance.obj: \
     "Network.h" \
     "ProtocolInstanceF.h" \
     "RouterInfo.h" \
-    "$(includedir)\Ice\RouterF.h" \
-    "EndpointIF.h" \
     "$(includedir)\Ice\Router.h" \
+    "EndpointIF.h" \
+    "$(includedir)\Ice\Comparable.h" \
     "LocatorInfo.h" \
     "$(includedir)\Ice\LocatorF.h" \
     "$(includedir)\Ice\Locator.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
     "ReferenceFactory.h" \
     "Reference.h" \
+    "$(includedir)\Ice\RouterF.h" \
     "BatchRequestQueue.h" \
     "SharedContext.h" \
     "$(includedir)\Ice\Properties.h" \
@@ -3228,6 +3307,7 @@ InstrumentationI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -3236,6 +3316,7 @@ InstrumentationI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -3271,7 +3352,7 @@ InstrumentationI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -3281,13 +3362,13 @@ InstrumentationI.obj: \
     "$(includedir)\Ice\Metrics.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\MetricsAdminI.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
@@ -3340,6 +3421,7 @@ IPEndpointI.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -3348,6 +3430,7 @@ IPEndpointI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Version.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -3383,7 +3466,7 @@ IPEndpointI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -3423,6 +3506,7 @@ IPEndpointI.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -3472,6 +3556,7 @@ LocatorInfo.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -3480,6 +3565,7 @@ LocatorInfo.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\Ice\ProxyFactoryF.h" \
     "$(includedir)\Ice\ConnectionIF.h" \
@@ -3507,7 +3593,7 @@ LocatorInfo.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -3519,6 +3605,7 @@ LocatorInfo.obj: \
     "$(includedir)\Ice\Locator.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -3526,8 +3613,7 @@ LocatorInfo.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "Instance.h" \
@@ -3561,7 +3647,6 @@ LocatorInfo.obj: \
     "ImplicitContextI.h" \
     "$(includedir)\Ice\ImplicitContext.h" \
     "$(includedir)\Ice\FacetMap.h" \
-    "$(includedir)\Ice\Process.h" \
     "TraceLevels.h" \
     "$(includedir)\Ice\LoggerUtil.h" \
     "$(includedir)\Ice\Logger.h" \
@@ -3593,6 +3678,7 @@ LoggerAdminI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -3601,6 +3687,7 @@ LoggerAdminI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -3636,7 +3723,7 @@ LoggerAdminI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -3655,6 +3742,7 @@ LoggerAdminI.obj: \
     "$(includedir)\Ice\Communicator.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -3670,7 +3758,6 @@ LoggerAdminI.obj: \
     "$(includedir)\Ice\RemoteLogger.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectAdapter.h" \
     "$(includedir)\Ice\Endpoint.h" \
     "$(includedir)\Ice\Connection.h" \
@@ -3693,6 +3780,7 @@ LoggerI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -3701,6 +3789,7 @@ LoggerI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -3732,6 +3821,7 @@ LoggerUtil.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -3740,6 +3830,7 @@ LoggerUtil.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -3793,7 +3884,7 @@ LoggerUtil.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -3819,6 +3910,7 @@ LoggerUtil.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -3839,6 +3931,7 @@ MetricsAdminI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -3847,6 +3940,7 @@ MetricsAdminI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -3881,7 +3975,7 @@ MetricsAdminI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -3890,6 +3984,7 @@ MetricsAdminI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -3910,7 +4005,6 @@ MetricsAdminI.obj: \
     "$(includedir)\Ice\Metrics.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "InstrumentationI.h" \
     "$(includedir)\Ice\MetricsObserverI.h" \
     "..\..\src\IceUtil\StopWatch.h" \
@@ -3966,6 +4060,7 @@ MetricsObserverI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -3974,6 +4069,7 @@ MetricsObserverI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -4009,7 +4105,7 @@ MetricsObserverI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -4019,13 +4115,13 @@ MetricsObserverI.obj: \
     "$(includedir)\Ice\Metrics.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\MetricsAdminI.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
@@ -4060,6 +4156,7 @@ Network.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -4068,6 +4165,7 @@ Network.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -4102,7 +4200,7 @@ Network.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -4150,6 +4248,7 @@ Network.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -4179,6 +4278,7 @@ NetworkProxy.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -4187,6 +4287,7 @@ NetworkProxy.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -4221,7 +4322,7 @@ NetworkProxy.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -4236,6 +4337,7 @@ NetworkProxy.obj: \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -4264,6 +4366,7 @@ Object.obj: \
     "$(includedir)\Ice\IncomingAsyncF.h" \
     "$(includedir)\Ice\Current.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -4272,6 +4375,7 @@ Object.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -4286,7 +4390,7 @@ Object.obj: \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -4317,6 +4421,7 @@ Object.obj: \
     "$(includedir)\Ice\SlicedData.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
 
 ObjectAdapterFactory.obj: \
 	ObjectAdapterFactory.cpp \
@@ -4341,6 +4446,7 @@ ObjectAdapterFactory.obj: \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -4349,6 +4455,7 @@ ObjectAdapterFactory.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\Ice\ProxyFactoryF.h" \
@@ -4377,7 +4484,7 @@ ObjectAdapterFactory.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -4432,6 +4539,7 @@ ObjectAdapterI.obj: \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -4440,6 +4548,7 @@ ObjectAdapterI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\Ice\ProxyFactoryF.h" \
@@ -4468,7 +4577,7 @@ ObjectAdapterI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -4518,6 +4627,7 @@ ObjectAdapterI.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "ProxyFactory.h" \
@@ -4545,16 +4655,16 @@ ObjectAdapterI.obj: \
     "RequestHandler.h" \
     "ResponseHandler.h" \
     "$(includedir)\Ice\ConnectionAsync.h" \
+    "$(includedir)\Ice\Comparable.h" \
     "ServantManager.h" \
     "RouterInfo.h" \
+    "$(includedir)\Ice\Router.h" \
     "$(includedir)\Ice\Functional.h" \
     "$(includedir)\IceUtil\Functional.h" \
     "LocatorInfo.h" \
     "$(includedir)\Ice\Locator.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Ice\LoggerUtil.h" \
     "$(includedir)\Ice\Logger.h" \
     "ThreadPool.h" \
@@ -4562,7 +4672,6 @@ ObjectAdapterI.obj: \
     "$(includedir)\IceUtil\StringUtil.h" \
     "$(includedir)\Ice\Communicator.h" \
     "$(includedir)\Ice\ImplicitContextF.h" \
-    "$(includedir)\Ice\Router.h" \
     "DefaultsAndOverrides.h" \
     "TraceLevels.h" \
     "PropertyNames.h" \
@@ -4583,11 +4692,12 @@ ObjectFactoryManager.obj: \
     "$(includedir)\Ice\Handle.h" \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -4596,10 +4706,10 @@ ObjectFactoryManager.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Functional.h" \
     "$(includedir)\IceUtil\Functional.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -4622,6 +4732,7 @@ ObserverHelper.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -4630,6 +4741,7 @@ ObserverHelper.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -4666,7 +4778,7 @@ ObserverHelper.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -4682,6 +4794,7 @@ ObserverHelper.obj: \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -4738,6 +4851,7 @@ OpaqueEndpointI.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -4746,6 +4860,7 @@ OpaqueEndpointI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Version.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -4776,7 +4891,7 @@ OpaqueEndpointI.obj: \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -4839,12 +4954,14 @@ Outgoing.obj: \
     "$(includedir)\Ice\IncomingAsyncF.h" \
     "$(includedir)\Ice\Current.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -4852,7 +4969,7 @@ Outgoing.obj: \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -4913,6 +5030,7 @@ Outgoing.obj: \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
@@ -4964,12 +5082,14 @@ OutgoingAsync.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -4988,7 +5108,7 @@ OutgoingAsync.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -5042,6 +5162,7 @@ OutgoingAsync.obj: \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
@@ -5089,6 +5210,7 @@ PluginManagerI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -5097,6 +5219,7 @@ PluginManagerI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\LoggerF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -5132,7 +5255,7 @@ PluginManagerI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -5141,6 +5264,7 @@ PluginManagerI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -5205,6 +5329,7 @@ PropertiesAdminI.obj: \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -5213,6 +5338,7 @@ PropertiesAdminI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\Ice\ProxyFactoryF.h" \
@@ -5243,7 +5369,7 @@ PropertiesAdminI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -5252,6 +5378,7 @@ PropertiesAdminI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -5285,6 +5412,7 @@ PropertiesI.obj: \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -5293,6 +5421,7 @@ PropertiesI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\Ice\ProxyFactoryF.h" \
     "$(includedir)\Ice\ConnectionIF.h" \
@@ -5322,7 +5451,7 @@ PropertiesI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -5331,6 +5460,7 @@ PropertiesI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -5381,6 +5511,7 @@ Protocol.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -5389,6 +5520,7 @@ Protocol.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -5412,6 +5544,7 @@ ProtocolInstance.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -5420,6 +5553,7 @@ ProtocolInstance.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -5454,7 +5588,7 @@ ProtocolInstance.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -5500,6 +5634,7 @@ ProtocolInstance.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -5528,6 +5663,7 @@ ProtocolPluginFacade.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -5536,6 +5672,7 @@ ProtocolPluginFacade.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -5587,7 +5724,7 @@ ProtocolPluginFacade.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -5616,6 +5753,7 @@ ProtocolPluginFacade.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -5651,12 +5789,14 @@ Proxy.obj: \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -5681,7 +5821,7 @@ Proxy.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -5693,6 +5833,7 @@ Proxy.obj: \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -5752,6 +5893,8 @@ Proxy.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\Process.h" \
     "RouterInfo.h" \
+    "$(includedir)\Ice\Router.h" \
+    "$(includedir)\Ice\Comparable.h" \
     "LocatorInfo.h" \
     "ConnectionI.h" \
     "..\..\src\IceUtil\StopWatch.h" \
@@ -5788,6 +5931,7 @@ ProxyFactory.obj: \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\StreamF.h" \
     "$(includedir)\Ice\OutgoingAsyncF.h" \
     "$(includedir)\Ice\Properties.h" \
@@ -5797,6 +5941,7 @@ ProxyFactory.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\Ice\ConnectionIF.h" \
     "$(includedir)\Ice\RequestHandlerF.h" \
@@ -5823,7 +5968,7 @@ ProxyFactory.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -5832,6 +5977,7 @@ ProxyFactory.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -5882,6 +6028,8 @@ ProxyFactory.obj: \
     "SharedContext.h" \
     "LocatorInfo.h" \
     "RouterInfo.h" \
+    "$(includedir)\Ice\Router.h" \
+    "$(includedir)\Ice\Comparable.h" \
     "$(includedir)\Ice\LoggerUtil.h" \
     "$(includedir)\Ice\Logger.h" \
     "TraceLevels.h" \
@@ -5906,6 +6054,7 @@ Reference.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -5914,6 +6063,7 @@ Reference.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -5946,7 +6096,7 @@ Reference.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -5962,6 +6112,7 @@ Reference.obj: \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -6011,12 +6162,11 @@ Reference.obj: \
     "ProtocolInstanceF.h" \
     "RouterInfo.h" \
     "$(includedir)\Ice\Router.h" \
+    "$(includedir)\Ice\Comparable.h" \
     "LocatorInfo.h" \
     "$(includedir)\Ice\Locator.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Ice\Functional.h" \
     "$(includedir)\IceUtil\Functional.h" \
     "ConnectionI.h" \
@@ -6054,6 +6204,7 @@ ReferenceFactory.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -6062,6 +6213,7 @@ ReferenceFactory.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -6096,7 +6248,7 @@ ReferenceFactory.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -6105,6 +6257,7 @@ ReferenceFactory.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -6175,12 +6328,11 @@ ReferenceFactory.obj: \
     "EndpointFactoryF.h" \
     "RouterInfo.h" \
     "$(includedir)\Ice\Router.h" \
+    "$(includedir)\Ice\Comparable.h" \
     "LocatorInfo.h" \
     "$(includedir)\Ice\Locator.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Ice\LoggerUtil.h" \
     "$(includedir)\Ice\Logger.h" \
     "DefaultsAndOverrides.h" \
@@ -6202,6 +6354,7 @@ RegisterPluginsInit.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -6210,6 +6363,7 @@ RegisterPluginsInit.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -6247,7 +6401,7 @@ RegisterPluginsInit.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -6287,12 +6441,14 @@ RequestHandler.obj: \
     "$(includedir)\Ice\RouterF.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -6322,7 +6478,7 @@ RequestHandler.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -6338,6 +6494,7 @@ RequestHandler.obj: \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -6380,12 +6537,14 @@ RequestHandlerFactory.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -6400,7 +6559,7 @@ RequestHandlerFactory.obj: \
     "$(includedir)\Ice\Current.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -6433,12 +6592,15 @@ RequestHandlerFactory.obj: \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "RouterInfo.h" \
+    "$(includedir)\Ice\Router.h" \
+    "$(includedir)\Ice\Comparable.h" \
     "ObjectAdapterFactory.h" \
     "ObjectAdapterI.h" \
     "$(includedir)\IceUtil\RecMutex.h" \
@@ -6486,6 +6648,7 @@ ResponseHandler.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -6494,6 +6657,7 @@ ResponseHandler.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -6538,12 +6702,14 @@ RetryQueue.obj: \
     "$(includedir)\Ice\CommunicatorF.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -6560,7 +6726,7 @@ RetryQueue.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -6606,6 +6772,7 @@ RetryQueue.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -6630,11 +6797,12 @@ RouterInfo.obj: \
     "$(includedir)\Ice\Handle.h" \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\RouterF.h" \
+    "$(includedir)\Ice\Router.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -6643,6 +6811,7 @@ RouterInfo.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\Ice\ProxyFactoryF.h" \
     "$(includedir)\Ice\ConnectionIF.h" \
@@ -6672,22 +6841,23 @@ RouterInfo.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
     "$(includedir)\Ice\SlicedDataF.h" \
     "$(includedir)\Ice\UserExceptionFactory.h" \
     "$(includedir)\Ice\FactoryTable.h" \
-    "EndpointIF.h" \
-    "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\Router.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
+    "$(includedir)\Ice\BuiltinSequences.h" \
+    "EndpointIF.h" \
+    "$(includedir)\Ice\Comparable.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\Connection.h" \
     "$(includedir)\Ice\Endpoint.h" \
@@ -6695,6 +6865,7 @@ RouterInfo.obj: \
     "$(includedir)\IceUtil\Functional.h" \
     "Reference.h" \
     "ReferenceFactoryF.h" \
+    "$(includedir)\Ice\RouterF.h" \
     "$(includedir)\Ice\LocatorF.h" \
     "LocatorInfoF.h" \
     "BatchRequestQueue.h" \
@@ -6730,6 +6901,7 @@ Selector.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -6738,6 +6910,7 @@ Selector.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\Ice\ProxyFactoryF.h" \
     "$(includedir)\Ice\ConnectionIF.h" \
@@ -6765,7 +6938,7 @@ Selector.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -6810,6 +6983,7 @@ Selector.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -6839,6 +7013,7 @@ ServantManager.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -6847,6 +7022,7 @@ ServantManager.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -6898,7 +7074,7 @@ ServantManager.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -6923,6 +7099,7 @@ ServantManager.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
@@ -6957,6 +7134,7 @@ Service.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -6965,6 +7143,7 @@ Service.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -6996,7 +7175,7 @@ Service.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -7010,6 +7189,7 @@ Service.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -7021,7 +7201,6 @@ Service.obj: \
     "$(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" \
@@ -7044,7 +7223,6 @@ Service.obj: \
     "$(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" \
@@ -7089,6 +7267,7 @@ SliceChecksums.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -7097,6 +7276,7 @@ SliceChecksums.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -7131,6 +7311,7 @@ SlicedData.obj: \
     "$(includedir)\Ice\IncomingAsyncF.h" \
     "$(includedir)\Ice\Current.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -7139,6 +7320,7 @@ SlicedData.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -7147,10 +7329,11 @@ SlicedData.obj: \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\Ice\Version.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -7173,6 +7356,7 @@ Stream.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\LocalObject.h" \
@@ -7180,6 +7364,7 @@ Stream.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -7213,7 +7398,7 @@ Stream.obj: \
     "$(includedir)\Ice\Instrumentation.h" \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -7238,6 +7423,7 @@ StreamI.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\LocalObject.h" \
@@ -7245,6 +7431,7 @@ StreamI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -7278,7 +7465,7 @@ StreamI.obj: \
     "$(includedir)\Ice\Instrumentation.h" \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -7323,6 +7510,7 @@ StreamI.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -7349,6 +7537,7 @@ StreamSocket.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -7357,6 +7546,7 @@ StreamSocket.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -7391,7 +7581,7 @@ StreamSocket.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -7438,6 +7628,7 @@ StreamSocket.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -7459,6 +7650,7 @@ StringConverterPlugin.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -7467,6 +7659,7 @@ StringConverterPlugin.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -7513,7 +7706,7 @@ StringConverterPlugin.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -7521,6 +7714,7 @@ StringConverterPlugin.obj: \
     "$(includedir)\Ice\UserExceptionFactory.h" \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -7565,6 +7759,7 @@ TcpAcceptor.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -7573,6 +7768,7 @@ TcpAcceptor.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -7607,7 +7803,7 @@ TcpAcceptor.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -7655,6 +7851,7 @@ TcpAcceptor.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -7695,6 +7892,7 @@ TcpConnector.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -7703,6 +7901,7 @@ TcpConnector.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -7737,7 +7936,7 @@ TcpConnector.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -7785,6 +7984,7 @@ TcpConnector.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -7828,6 +8028,7 @@ TcpEndpointI.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -7836,6 +8037,7 @@ TcpEndpointI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Version.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -7871,7 +8073,7 @@ TcpEndpointI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -7914,6 +8116,7 @@ TcpEndpointI.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -7947,6 +8150,7 @@ TcpTransceiver.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -7955,6 +8159,7 @@ TcpTransceiver.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -7993,7 +8198,7 @@ TcpTransceiver.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -8039,6 +8244,7 @@ TcpTransceiver.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -8071,6 +8277,7 @@ ThreadPool.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -8079,6 +8286,7 @@ ThreadPool.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -8108,7 +8316,7 @@ ThreadPool.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -8154,6 +8362,7 @@ ThreadPool.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -8187,6 +8396,7 @@ TraceLevels.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -8195,6 +8405,7 @@ TraceLevels.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -8229,7 +8440,7 @@ TraceLevels.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -8239,6 +8450,7 @@ TraceLevels.obj: \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -8269,6 +8481,7 @@ TraceUtil.obj: \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -8277,6 +8490,7 @@ TraceUtil.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -8321,7 +8535,7 @@ TraceUtil.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -8349,6 +8563,7 @@ TraceUtil.obj: \
     "$(includedir)\Ice\FacetMap.h" \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -8373,6 +8588,7 @@ Transceiver.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -8381,6 +8597,7 @@ Transceiver.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -8419,7 +8636,7 @@ Transceiver.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -8451,6 +8668,7 @@ UdpConnector.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -8459,6 +8677,7 @@ UdpConnector.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -8493,7 +8712,7 @@ UdpConnector.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -8537,6 +8756,7 @@ UdpConnector.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -8577,6 +8797,7 @@ UdpEndpointI.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -8585,6 +8806,7 @@ UdpEndpointI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Version.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -8620,7 +8842,7 @@ UdpEndpointI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -8666,6 +8888,7 @@ UdpEndpointI.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -8696,6 +8919,7 @@ UdpTransceiver.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -8704,6 +8928,7 @@ UdpTransceiver.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -8737,7 +8962,7 @@ UdpTransceiver.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -8787,6 +9012,7 @@ UdpTransceiver.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -8813,6 +9039,7 @@ WSAcceptor.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -8821,6 +9048,7 @@ WSAcceptor.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -8863,7 +9091,7 @@ WSAcceptor.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -8907,6 +9135,7 @@ WSAcceptor.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -8934,6 +9163,7 @@ WSConnector.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -8942,6 +9172,7 @@ WSConnector.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -8982,7 +9213,7 @@ WSConnector.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -9026,6 +9257,7 @@ WSConnector.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -9057,6 +9289,7 @@ WSEndpoint.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -9065,6 +9298,7 @@ WSEndpoint.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Version.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -9111,7 +9345,7 @@ WSEndpoint.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -9150,6 +9384,7 @@ WSEndpoint.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -9180,6 +9415,7 @@ WSTransceiver.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -9188,6 +9424,7 @@ WSTransceiver.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -9222,7 +9459,7 @@ WSTransceiver.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -9268,6 +9505,7 @@ WSTransceiver.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -9305,6 +9543,7 @@ DLLMain.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -9313,6 +9552,7 @@ DLLMain.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\Identity.h" \
@@ -9358,7 +9598,7 @@ DLLMain.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -9371,6 +9611,7 @@ DLLMain.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -9382,7 +9623,6 @@ DLLMain.obj: \
     "$(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" \
@@ -9404,7 +9644,6 @@ DLLMain.obj: \
     "$(includedir)\IceUtil\Functional.h" \
     "$(includedir)\Ice\Stream.h" \
     "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Ice\Router.h" \
     "$(includedir)\Ice\DispatchInterceptor.h" \
     "$(includedir)\Ice\NativePropertiesAdmin.h" \
@@ -9427,6 +9666,7 @@ BuiltinSequences.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -9435,6 +9675,7 @@ BuiltinSequences.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -9453,7 +9694,7 @@ BuiltinSequences.obj: \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -9475,6 +9716,7 @@ Communicator.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -9483,6 +9725,7 @@ Communicator.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -9517,7 +9760,7 @@ Communicator.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -9526,6 +9769,7 @@ Communicator.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -9542,7 +9786,6 @@ Communicator.obj: \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\FacetMap.h" \
     "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -9563,6 +9806,7 @@ CommunicatorF.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -9571,6 +9815,7 @@ CommunicatorF.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -9589,6 +9834,7 @@ Connection.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -9597,6 +9843,7 @@ Connection.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -9631,7 +9878,7 @@ Connection.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -9659,6 +9906,7 @@ ConnectionF.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -9667,6 +9915,7 @@ ConnectionF.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -9685,6 +9934,7 @@ Current.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -9693,6 +9943,7 @@ Current.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -9710,7 +9961,7 @@ Current.obj: \
     "$(includedir)\IceUtil\Time.h" \
     "$(includedir)\IceUtil\MutexProtocol.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -9732,6 +9983,7 @@ Endpoint.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -9740,6 +9992,7 @@ Endpoint.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Version.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -9760,7 +10013,7 @@ Endpoint.obj: \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -9782,6 +10035,7 @@ EndpointF.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -9790,6 +10044,7 @@ EndpointF.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -9808,6 +10063,7 @@ EndpointTypes.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -9816,31 +10072,10 @@ EndpointTypes.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
-    "$(includedir)\Ice\BasicStream.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\Ice\InstanceF.h" \
-    "$(includedir)\Ice\Object.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\Current.h" \
-    "$(includedir)\Ice\ObjectAdapterF.h" \
-    "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\Ice\ObjectFactoryManagerF.h" \
-    "$(includedir)\Ice\Buffer.h" \
-    "$(includedir)\Ice\Protocol.h" \
-    "$(includedir)\Ice\SlicedDataF.h" \
-    "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\FactoryTable.h" \
 
 FacetMap.obj: \
 	FacetMap.cpp \
@@ -9856,6 +10091,7 @@ FacetMap.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -9864,6 +10100,7 @@ FacetMap.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -9882,7 +10119,7 @@ FacetMap.obj: \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -9904,6 +10141,7 @@ Identity.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -9912,6 +10150,7 @@ Identity.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -9929,7 +10168,7 @@ Identity.obj: \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -9951,6 +10190,7 @@ ImplicitContext.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -9959,6 +10199,7 @@ ImplicitContext.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\Identity.h" \
@@ -9979,7 +10220,7 @@ ImplicitContext.obj: \
     "$(includedir)\IceUtil\Time.h" \
     "$(includedir)\IceUtil\MutexProtocol.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -10001,6 +10242,7 @@ ImplicitContextF.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10009,6 +10251,7 @@ ImplicitContextF.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -10027,6 +10270,7 @@ Instrumentation.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10035,6 +10279,7 @@ Instrumentation.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -10054,7 +10299,7 @@ Instrumentation.obj: \
     "$(includedir)\IceUtil\Time.h" \
     "$(includedir)\IceUtil\MutexProtocol.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -10076,6 +10321,7 @@ InstrumentationF.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10084,6 +10330,7 @@ InstrumentationF.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -10102,6 +10349,7 @@ LocalException.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10110,6 +10358,7 @@ LocalException.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -10129,7 +10378,7 @@ LocalException.obj: \
     "$(includedir)\Ice\Current.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ConnectionF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -10151,6 +10400,7 @@ Locator.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10159,6 +10409,7 @@ Locator.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -10193,7 +10444,7 @@ Locator.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -10202,6 +10453,7 @@ Locator.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -10209,8 +10461,7 @@ Locator.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -10233,6 +10484,7 @@ LocatorF.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10241,6 +10493,7 @@ LocatorF.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -10275,7 +10528,7 @@ LocatorF.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -10297,6 +10550,7 @@ Logger.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10305,6 +10559,7 @@ Logger.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -10323,6 +10578,7 @@ LoggerF.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10331,6 +10587,7 @@ LoggerF.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -10349,6 +10606,7 @@ Metrics.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10357,6 +10615,7 @@ Metrics.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -10391,7 +10650,7 @@ Metrics.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -10400,13 +10659,13 @@ Metrics.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -10429,6 +10688,7 @@ ObjectAdapter.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10437,6 +10697,7 @@ ObjectAdapter.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -10471,7 +10732,7 @@ ObjectAdapter.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -10498,6 +10759,7 @@ ObjectAdapterF.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10506,6 +10768,7 @@ ObjectAdapterF.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -10524,6 +10787,7 @@ ObjectFactory.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10532,6 +10796,7 @@ ObjectFactory.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -10550,7 +10815,6 @@ ObjectFactory.obj: \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -10558,32 +10822,6 @@ ObjectFactory.obj: \
     "$(includedir)\Ice\UserExceptionFactory.h" \
     "$(includedir)\Ice\FactoryTable.h" \
 
-ObjectFactoryF.obj: \
-	ObjectFactoryF.cpp \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
-    "$(includedir)\IceUtil\PushDisableWarnings.h" \
-    "$(includedir)\Ice\ProxyF.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\Ice\Config.h" \
-    "$(includedir)\Ice\ProxyHandle.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\Ice\ObjectF.h" \
-    "$(includedir)\Ice\Handle.h" \
-    "$(includedir)\Ice\Exception.h" \
-    "$(includedir)\Ice\Format.h" \
-    "$(includedir)\Ice\StreamF.h" \
-    "$(includedir)\Ice\LocalObject.h" \
-    "$(includedir)\Ice\LocalObjectF.h" \
-    "$(includedir)\Ice\StreamHelpers.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\Iterator.h" \
-    "$(includedir)\IceUtil\Optional.h" \
-    "$(includedir)\IceUtil\UndefSysMacros.h" \
-    "$(includedir)\IceUtil\PopDisableWarnings.h" \
-
 Plugin.obj: \
 	Plugin.cpp \
     "$(includedir)\Ice\Plugin.h" \
@@ -10598,6 +10836,7 @@ Plugin.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10606,6 +10845,7 @@ Plugin.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\LoggerF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -10626,7 +10866,7 @@ Plugin.obj: \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -10648,6 +10888,7 @@ PluginF.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10656,6 +10897,7 @@ PluginF.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -10674,6 +10916,7 @@ Process.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10682,6 +10925,7 @@ Process.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -10716,7 +10960,7 @@ Process.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -10725,13 +10969,13 @@ Process.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -10752,6 +10996,7 @@ ProcessF.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10760,6 +11005,7 @@ ProcessF.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -10794,7 +11040,7 @@ ProcessF.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -10816,6 +11062,7 @@ Properties.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10824,6 +11071,7 @@ Properties.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -10858,7 +11106,7 @@ Properties.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -10867,6 +11115,7 @@ Properties.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -10875,7 +11124,6 @@ Properties.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -10896,6 +11144,7 @@ PropertiesAdmin.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10904,6 +11153,7 @@ PropertiesAdmin.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -10938,7 +11188,7 @@ PropertiesAdmin.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -10947,6 +11197,7 @@ PropertiesAdmin.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -10954,7 +11205,6 @@ PropertiesAdmin.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -10975,6 +11225,7 @@ PropertiesF.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -10983,6 +11234,7 @@ PropertiesF.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -11017,7 +11269,7 @@ PropertiesF.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -11039,6 +11291,7 @@ RemoteLogger.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -11047,6 +11300,7 @@ RemoteLogger.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -11081,7 +11335,7 @@ RemoteLogger.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -11090,13 +11344,13 @@ RemoteLogger.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -11119,6 +11373,7 @@ Router.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -11127,6 +11382,7 @@ Router.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -11161,7 +11417,7 @@ Router.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -11170,13 +11426,13 @@ Router.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -11197,6 +11453,7 @@ RouterF.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -11205,6 +11462,7 @@ RouterF.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -11239,7 +11497,7 @@ RouterF.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -11261,6 +11519,7 @@ ServantLocator.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -11269,6 +11528,7 @@ ServantLocator.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -11287,7 +11547,7 @@ ServantLocator.obj: \
     "$(includedir)\IceUtil\Time.h" \
     "$(includedir)\IceUtil\MutexProtocol.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -11309,6 +11569,7 @@ ServantLocatorF.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -11317,6 +11578,7 @@ ServantLocatorF.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -11335,6 +11597,7 @@ SliceChecksumDict.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -11343,6 +11606,7 @@ SliceChecksumDict.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -11361,7 +11625,7 @@ SliceChecksumDict.obj: \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -11383,6 +11647,7 @@ Version.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -11391,6 +11656,7 @@ Version.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -11408,7 +11674,7 @@ Version.obj: \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
diff --git a/cpp/src/Ice/ACM.cpp b/cpp/src/Ice/ACM.cpp
index c7cd625b253..79a9785d5e0 100644
--- a/cpp/src/Ice/ACM.cpp
+++ b/cpp/src/Ice/ACM.cpp
@@ -18,8 +18,10 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(ACMMonitor* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(FactoryACMMonitor* p) { return p; }
+#endif
 
 IceInternal::ACMConfig::ACMConfig(bool server) :
     timeout(IceUtil::Time::seconds(60)), 
@@ -107,7 +109,7 @@ IceInternal::FactoryACMMonitor::add(const ConnectionIPtr& connection)
     if(_connections.empty())
     {
         _connections.insert(connection);
-        _instance->timer()->scheduleRepeated(this, _config.timeout / 2);
+        _instance->timer()->scheduleRepeated(ICE_SHARED_FROM_THIS, _config.timeout / 2);
     }
     else
     {
@@ -156,7 +158,7 @@ IceInternal::FactoryACMMonitor::acm(const IceUtil::Optional<int>& timeout,
     {
         config.heartbeat = *heartbeat;
     }
-    return new ConnectionACMMonitor(this, _instance->timer(), config);
+    return ICE_MAKE_SHARED(ConnectionACMMonitor, ICE_SHARED_FROM_THIS, _instance->timer(), config);
 }
 
 Ice::ACM
@@ -201,7 +203,7 @@ IceInternal::FactoryACMMonitor::runTimerTask()
 
         if(_connections.empty())
         {
-            _instance->timer()->cancel(this);
+            _instance->timer()->cancel(ICE_SHARED_FROM_THIS);
             return;
         }
     }
@@ -275,7 +277,7 @@ IceInternal::ConnectionACMMonitor::add(const ConnectionIPtr& connection)
     _connection = connection;
     if(_config.timeout != IceUtil::Time())
     {
-        _timer->scheduleRepeated(this, _config.timeout / 2);
+        _timer->scheduleRepeated(ICE_SHARED_FROM_THIS, _config.timeout / 2);
     }
 }
 
@@ -286,7 +288,7 @@ IceInternal::ConnectionACMMonitor::remove(const ConnectionIPtr& connection)
     assert(_connection == connection);
     if(_config.timeout != IceUtil::Time())
     {
-        _timer->cancel(this);
+        _timer->cancel(ICE_SHARED_FROM_THIS);
     }
     _connection = 0;
 }
diff --git a/cpp/src/Ice/ACM.h b/cpp/src/Ice/ACM.h
index c791708a202..9d8f151daac 100644
--- a/cpp/src/Ice/ACM.h
+++ b/cpp/src/Ice/ACM.h
@@ -50,7 +50,8 @@ public:
     virtual Ice::ACM getACM() = 0;
 };
 
-class FactoryACMMonitor : public ACMMonitor, public ::IceUtil::Mutex
+class FactoryACMMonitor : public ACMMonitor, public ::IceUtil::Mutex,
+                          public ICE_ENABLE_SHARED_FROM_THIS(FactoryACMMonitor)
 {
 public:
 
@@ -85,7 +86,8 @@ private:
     std::vector<Ice::ConnectionIPtr> _reapedConnections;
 };
 
-class ConnectionACMMonitor : public ACMMonitor, public ::IceUtil::Mutex
+class ConnectionACMMonitor : public ACMMonitor, public ::IceUtil::Mutex,
+                             public ICE_ENABLE_SHARED_FROM_THIS(ConnectionACMMonitor)
 {
 public:
 
diff --git a/cpp/src/Ice/Application.cpp b/cpp/src/Ice/Application.cpp
index 3c30bdc7301..59a0c8d4551 100644
--- a/cpp/src/Ice/Application.cpp
+++ b/cpp/src/Ice/Application.cpp
@@ -312,9 +312,9 @@ Ice::Application::main(int argc, char* argv[], const char* configFile)
         IceInternal::Application::_appName = argv[0];
     }
 
-    if(argc > 0 && argv[0] && LoggerIPtr::dynamicCast(getProcessLogger()))
+    if(argc > 0 && argv[0] && ICE_DYNAMIC_CAST(LoggerI, getProcessLogger()))
     {
-        setProcessLogger(new LoggerI(argv[0], "", true, IceUtil::getProcessStringConverter()));
+        setProcessLogger(ICE_MAKE_SHARED(LoggerI, argv[0], "", true, IceUtil::getProcessStringConverter()));
     }
 
     InitializationData initData;
@@ -364,12 +364,12 @@ Ice::Application::main(int argc, wchar_t* argv[], const Ice::InitializationData&
 int
 Ice::Application::main(int argc, char* argv[], const InitializationData& initializationData)
 {
-    if(argc > 0 && argv[0] && LoggerIPtr::dynamicCast(getProcessLogger()))
+    if(argc > 0 && argv[0] && ICE_DYNAMIC_CAST(LoggerI, getProcessLogger()))
     {
         const bool convert = initializationData.properties ?
                 initializationData.properties->getPropertyAsIntWithDefault("Ice.LogStdErr.Convert", 1) > 0 &&
                 initializationData.properties->getProperty("Ice.StdErr").empty() : true;
-        setProcessLogger(new LoggerI(argv[0], "", convert, IceUtil::getProcessStringConverter()));
+        setProcessLogger(ICE_MAKE_SHARED(LoggerI, argv[0], "", convert, IceUtil::getProcessStringConverter()));
     }
 
     if(IceInternal::Application::_communicator != 0)
@@ -655,13 +655,13 @@ Ice::Application::doMain(int argc, char* argv[], const InitializationData& initD
         // If the process logger is the default logger, we now replace it with a
         // a logger which is using the program name for the prefix.
         //
-        if(initData.properties->getProperty("Ice.ProgramName") != "" && LoggerIPtr::dynamicCast(getProcessLogger()))
+        if(initData.properties->getProperty("Ice.ProgramName") != "" && ICE_DYNAMIC_CAST(LoggerI, getProcessLogger()))
         {
             const bool convert =
                 initData.properties->getPropertyAsIntWithDefault("Ice.LogStdErr.Convert", 1) > 0 &&
                 initData.properties->getProperty("Ice.StdErr").empty();
 
-            setProcessLogger(new LoggerI(initData.properties->getProperty("Ice.ProgramName"), "", convert,
+            setProcessLogger(ICE_MAKE_SHARED(LoggerI, initData.properties->getProperty("Ice.ProgramName"), "", convert,
                                          IceUtil::getProcessStringConverter()));
         }
 
diff --git a/cpp/src/Ice/AsyncResult.cpp b/cpp/src/Ice/AsyncResult.cpp
index 71d8106bd79..69ba7d0b5ab 100644
--- a/cpp/src/Ice/AsyncResult.cpp
+++ b/cpp/src/Ice/AsyncResult.cpp
@@ -20,7 +20,9 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* Ice::upCast(AsyncResult* p) { return p; }
+#endif
 
 const unsigned char Ice::AsyncResult::OK = 0x1;
 const unsigned char Ice::AsyncResult::Done = 0x2;
@@ -51,10 +53,10 @@ AsyncResult::getConnection() const
     return 0;
 }
 
-ObjectPrx 
+ObjectPrxPtr
 AsyncResult::getProxy() const
 {
-    return 0;
+    return ICE_NULLPTR;
 }
 
 bool
@@ -107,11 +109,13 @@ AsyncResult::sentSynchronously() const
     return _sentSynchronously;
 }
 
+#ifndef ICE_CPP11_MAPPING
 LocalObjectPtr 
 AsyncResult::getCookie() const
 {
     return _cookie;
 }
+#endif
 
 const std::string& 
 AsyncResult::getOperation() const
@@ -204,6 +208,25 @@ AsyncResult::__check(const AsyncResultPtr& r, const string& operation)
     }
 }
 
+#ifdef ICE_CPP11_MAPPING
+AsyncResult::AsyncResult(const CommunicatorPtr& communicator,
+                         const IceInternal::InstancePtr& instance,
+                         const string& op,
+                         const CallbackBasePtr& callback) :
+    _instance(instance),
+    _sentSynchronously(false),
+    _is(instance.get(), Ice::currentProtocolEncoding),
+    _communicator(communicator),
+    _operation(op),
+    _callback(callback),
+    _state(0)
+{
+    if(!_callback)
+    {
+        throw IceUtil::IllegalArgumentException(__FILE__, __LINE__);
+    }
+}
+#else
 AsyncResult::AsyncResult(const CommunicatorPtr& communicator,
                          const IceInternal::InstancePtr& instance,
                          const string& op,
@@ -224,6 +247,7 @@ AsyncResult::AsyncResult(const CommunicatorPtr& communicator,
     }
     const_cast<CallbackBasePtr&>(_callback) = _callback->verify(_cookie);
 }
+#endif
 
 AsyncResult::~AsyncResult()
 {
@@ -266,7 +290,7 @@ AsyncResult::finished(bool ok)
         _observer.detach();
     }
     _monitor.notifyAll();
-    return _callback;
+    return _callback != ICE_NULLPTR;
 }
 
 bool
@@ -282,7 +306,7 @@ AsyncResult::finished(const Ice::Exception& ex)
         _observer.detach();
     }
     _monitor.notifyAll();
-    return _callback;
+    return _callback != ICE_NULLPTR;
 }
 
 void
@@ -315,7 +339,7 @@ AsyncResult::invokeSentAsync()
     //
     try
     {
-        _instance->clientThreadPool()->dispatch(new AsynchronousSent(_cachedConnection, this));
+        _instance->clientThreadPool()->dispatch(new AsynchronousSent(_cachedConnection, ICE_SHARED_FROM_THIS));
     }
     catch(const Ice::CommunicatorDestroyedException&)
     {
@@ -349,7 +373,7 @@ AsyncResult::invokeCompletedAsync()
     // CommunicatorDestroyedCompleted is the only exception that can propagate directly
     // from this method.
     //
-    _instance->clientThreadPool()->dispatch(new AsynchronousCompleted(_cachedConnection, this));
+    _instance->clientThreadPool()->dispatch(new AsynchronousCompleted(_cachedConnection, ICE_SHARED_FROM_THIS));
 }
 
 void
@@ -359,7 +383,7 @@ AsyncResult::invokeSent()
 
     try
     {
-        AsyncResultPtr self(this);
+        AsyncResultPtr self(ICE_SHARED_FROM_THIS);
         _callback->sent(self);
     }
     catch(const std::exception& ex)
@@ -373,7 +397,7 @@ AsyncResult::invokeSent()
 
     if(_observer)
     {
-        ObjectPrx proxy = getProxy();
+        ObjectPrxPtr proxy = getProxy();
         if(!proxy || !proxy->ice_isTwoway())
         {
             _observer.detach();
@@ -388,7 +412,7 @@ AsyncResult::invokeCompleted()
 
     try
     {
-        AsyncResultPtr self(this);
+        AsyncResultPtr self(ICE_SHARED_FROM_THIS);
         _callback->completed(self);
     }
     catch(const std::exception& ex)
@@ -416,7 +440,11 @@ AsyncResult::cancel(const Ice::LocalException& ex)
         }
         handler = _cancellationHandler;
     }
+#ifdef ICE_CPP11_MAPPING
+    handler->asyncRequestCanceled(dynamic_pointer_cast<OutgoingAsyncBase>(shared_from_this()), ex);
+#else
     handler->asyncRequestCanceled(OutgoingAsyncBasePtr::dynamicCast(this), ex);
+#endif
 }
 
 void
@@ -526,9 +554,10 @@ public:
 // versus the generated inline version of the begin_ method having
 // passed a pointer to the dummy delegate.
 //
-CallbackBasePtr IceInternal::__dummyCallback = new DummyCallback;
+CallbackBasePtr IceInternal::__dummyCallback = ICE_MAKE_SHARED(DummyCallback);
 
-#ifdef ICE_CPP11
+#ifndef ICE_CPP11_MAPPING
+#   ifdef ICE_CPP11_COMPILER
 
 Ice::CallbackPtr
 Ice::newCallback(const ::IceInternal::Function<void (const AsyncResultPtr&)>& completed,
@@ -564,7 +593,7 @@ Ice::newCallback(const ::IceInternal::Function<void (const AsyncResultPtr&)>& co
             if(_sent != nullptr)
             {
                 _sent(result);
-             }
+            }
         }
 
         virtual bool
@@ -581,6 +610,7 @@ Ice::newCallback(const ::IceInternal::Function<void (const AsyncResultPtr&)>& co
 
     return new Cpp11CB(completed, sent);
 }
+#   endif
 #endif
 
 void
@@ -596,4 +626,3 @@ IceInternal::CallbackBase::checkCallback(bool obj, bool cb)
     }
 }
 
-
diff --git a/cpp/src/Ice/BasicStream.cpp b/cpp/src/Ice/BasicStream.cpp
index e08914e0a7e..3bd7751a1e7 100644
--- a/cpp/src/Ice/BasicStream.cpp
+++ b/cpp/src/Ice/BasicStream.cpp
@@ -1580,16 +1580,28 @@ IceInternal::BasicStream::read(vector<wstring>& v)
 }
 
 void
-IceInternal::BasicStream::write(const ObjectPrx& v)
+#ifndef ICE_CPP11_MAPPING
+IceInternal::BasicStream::write(const ObjectPrxPtr& v)
+#else
+IceInternal::BasicStream::writeProxy(const ObjectPrxPtr& v)
+#endif
 {
     _instance->proxyFactory()->proxyToStream(v, this);
 }
 
+#ifndef ICE_CPP11_MAPPING
 void
-IceInternal::BasicStream::read(ObjectPrx& v)
+IceInternal::BasicStream::read(ObjectPrxPtr& v)
 {
     v = _instance->proxyFactory()->streamToProxy(this);
 }
+#else
+ObjectPrxPtr
+IceInternal::BasicStream::readProxy()
+{
+    return _instance->proxyFactory()->streamToProxy(this);
+}
+#endif
 
 Int
 IceInternal::BasicStream::readEnum(Int maxValue)
@@ -1904,20 +1916,27 @@ IceInternal::BasicStream::EncapsDecoder::readTypeId(bool isIndex)
     }
 }
 
-Ice::ObjectPtr
+Ice::ValuePtr
 IceInternal::BasicStream::EncapsDecoder::newInstance(const string& typeId)
 {
-    Ice::ObjectPtr v;
+    Ice::ValuePtr v;
 
     //
     // Try to find a factory registered for the specific type.
     //
+#ifdef ICE_CPP11_MAPPING
+    function<ValuePtr (const string&)> userFactory = _servantFactoryManager->find(typeId);
+    if(userFactory)
+    {
+        v = userFactory(typeId);
+    }
+#else
     ObjectFactoryPtr userFactory = _servantFactoryManager->find(typeId);
     if(userFactory)
     {
         v = userFactory->create(typeId);
     }
-
+#endif
     //
     // If that fails, invoke the default factory if one has been
     // registered.
@@ -1927,7 +1946,11 @@ IceInternal::BasicStream::EncapsDecoder::newInstance(const string& typeId)
         userFactory = _servantFactoryManager->find("");
         if(userFactory)
         {
+#ifdef ICE_CPP11_MAPPING
+            v = userFactory(typeId);
+#else
             v = userFactory->create(typeId);
+#endif
         }
     }
 
@@ -1937,12 +1960,21 @@ IceInternal::BasicStream::EncapsDecoder::newInstance(const string& typeId)
     //
     if(!v)
     {
+#ifdef ICE_CPP11_MAPPING
+        function<ValuePtr (const string&)> of = IceInternal::factoryTable->getObjectFactory(typeId);
+        if(of)
+        {
+            v = of(typeId);
+            assert(v);
+        }
+#else
         ObjectFactoryPtr of = IceInternal::factoryTable->getObjectFactory(typeId);
         if(of)
         {
             v = of->create(typeId);
             assert(v);
         }
+#endif
     }
 
     return v;
@@ -1990,7 +2022,7 @@ IceInternal::BasicStream::EncapsDecoder::addPatchEntry(Int index, PatchFunc patc
 }
 
 void
-IceInternal::BasicStream::EncapsDecoder::unmarshal(Int index, const Ice::ObjectPtr& v)
+IceInternal::BasicStream::EncapsDecoder::unmarshal(Int index, const Ice::ValuePtr& v)
 {
     //
     // Add the object to the map of un-marshalled objects, this must
@@ -2030,10 +2062,12 @@ IceInternal::BasicStream::EncapsDecoder::unmarshal(Int index, const Ice::ObjectP
     {
         try
         {
+#ifndef ICE_CPP11_MAPPING
             if(_stream->instance()->collectObjects())
             {
                 v->ice_collectable(true);
             }
+#endif
             v->ice_postUnmarshal();
         }
         catch(const std::exception& ex)
@@ -2063,10 +2097,12 @@ IceInternal::BasicStream::EncapsDecoder::unmarshal(Int index, const Ice::ObjectP
             {
                 try
                 {
+#ifndef ICE_CPP11_MAPPING
                     if(_stream->instance()->collectObjects())
                     {
                         (*p)->ice_collectable(true);
                     }
+#endif
                     (*p)->ice_postUnmarshal();
                 }
                 catch(const std::exception& ex)
@@ -2107,7 +2143,7 @@ IceInternal::BasicStream::EncapsDecoder10::read(PatchFunc patchFunc, void* patch
         // Calling the patch function for null instances is necessary for correct functioning of Ice for
         // Python and Ruby.
         //
-        ObjectPtr nil;
+        ValuePtr nil;
         patchFunc(patchAddr, nil);
     }
     else
@@ -2337,7 +2373,7 @@ IceInternal::BasicStream::EncapsDecoder10::readInstance()
     //
     startSlice();
     const string mostDerivedId = _typeId;
-    ObjectPtr v;
+    ValuePtr v;
     while(true)
     {
         //
@@ -2397,7 +2433,7 @@ IceInternal::BasicStream::EncapsDecoder11::read(PatchFunc patchFunc, void* patch
         //
         if(patchFunc)
         {
-            ObjectPtr nil;
+            ValuePtr nil;
             patchFunc(patchAddr, nil);
         }
     }
@@ -2685,7 +2721,7 @@ IceInternal::BasicStream::EncapsDecoder11::skipSlice()
     //
     // Preserve this slice.
     //
-    SliceInfoPtr info = new SliceInfo;
+    SliceInfoPtr info = ICE_MAKE_SHARED(SliceInfo);
     info->typeId = _current->typeId;
     info->compactId = _current->compactId;
     info->hasOptionalMembers = _current->sliceFlags & FLAG_HAS_OPTIONAL_MEMBERS;
@@ -2768,7 +2804,7 @@ IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc pat
     //
     startSlice();
     const string mostDerivedId = _current->typeId;
-    Ice::ObjectPtr v;
+    Ice::ValuePtr v;
     const CompactIdResolverPtr& compactIdResolver = _stream->instance()->initializationData().compactIdResolver;
     while(true)
     {
@@ -2853,7 +2889,7 @@ IceInternal::BasicStream::EncapsDecoder11::readInstance(Int index, PatchFunc pat
             v = newInstance(Object::ice_staticId());
             if(!v)
             {
-                v = new UnknownSlicedObject(mostDerivedId);
+                v = ICE_MAKE_SHARED(UnknownSlicedObject, mostDerivedId);
             }
 
             break;
@@ -2905,7 +2941,7 @@ IceInternal::BasicStream::EncapsDecoder11::readSlicedData()
         // enclosing object.
         //
         const IndexList& table = _current->indirectionTables[n];
-        vector<ObjectPtr>& objects = _current->slices[n]->objects;
+        vector<ValuePtr>& objects = _current->slices[n]->objects;
         objects.resize(table.size());
         IndexList::size_type j = 0;
         for(IndexList::const_iterator p = table.begin(); p != table.end(); ++p)
@@ -2913,7 +2949,7 @@ IceInternal::BasicStream::EncapsDecoder11::readSlicedData()
             addPatchEntry(*p, &patchHandle<Object>, &objects[j++]);
         }
     }
-    return new SlicedData(_current->slices);
+    return ICE_MAKE_SHARED(SlicedData, _current->slices);
 }
 
 Int
@@ -2932,7 +2968,7 @@ IceInternal::BasicStream::EncapsEncoder::registerTypeId(const string& typeId)
 }
 
 void
-IceInternal::BasicStream::EncapsEncoder10::write(const ObjectPtr& v)
+IceInternal::BasicStream::EncapsEncoder10::write(const ValuePtr& v)
 {
     //
     // Object references are encoded as a negative integer in 1.0.
@@ -3078,7 +3114,7 @@ IceInternal::BasicStream::EncapsEncoder10::writePendingObjects()
 }
 
 Int
-IceInternal::BasicStream::EncapsEncoder10::registerObject(const ObjectPtr& v)
+IceInternal::BasicStream::EncapsEncoder10::registerObject(const ValuePtr& v)
 {
     assert(v);
 
@@ -3109,7 +3145,7 @@ IceInternal::BasicStream::EncapsEncoder10::registerObject(const ObjectPtr& v)
 }
 
 void
-IceInternal::BasicStream::EncapsEncoder11::write(const ObjectPtr& v)
+IceInternal::BasicStream::EncapsEncoder11::write(const ValuePtr& v)
 {
     if(!v)
     {
@@ -3354,7 +3390,7 @@ IceInternal::BasicStream::EncapsEncoder11::writeSlicedData(const SlicedDataPtr&
 }
 
 void
-IceInternal::BasicStream::EncapsEncoder11::writeInstance(const ObjectPtr& v)
+IceInternal::BasicStream::EncapsEncoder11::writeInstance(const ValuePtr& v)
 {
     assert(v);
 
@@ -3392,4 +3428,3 @@ IceInternal::BasicStream::EncapsEncoder11::writeInstance(const ObjectPtr& v)
     _stream->writeSize(1); // Object instance marker.
     v->__write(_stream);
 }
-
diff --git a/cpp/src/Ice/BatchRequestQueue.cpp b/cpp/src/Ice/BatchRequestQueue.cpp
index c34de544df7..04bee6e06d5 100644
--- a/cpp/src/Ice/BatchRequestQueue.cpp
+++ b/cpp/src/Ice/BatchRequestQueue.cpp
@@ -25,7 +25,7 @@ class BatchRequestI : public Ice::BatchRequest
 {
 public:
 
-    BatchRequestI(BatchRequestQueue& queue, const Ice::ObjectPrx& proxy, const string& operation, int size) :
+    BatchRequestI(BatchRequestQueue& queue, const Ice::ObjectPrxPtr& proxy, const string& operation, int size) :
         _queue(queue), _proxy(proxy), _operation(operation), _size(size)
     {
     }
@@ -48,7 +48,7 @@ public:
         return _operation;
     }
 
-    virtual const Ice::ObjectPrx&
+    virtual const Ice::ObjectPrxPtr&
     getProxy() const
     {
         return _proxy;
@@ -57,7 +57,7 @@ public:
 private:
 
     BatchRequestQueue& _queue;
-    const Ice::ObjectPrx& _proxy;
+    const Ice::ObjectPrxPtr& _proxy;
     const std::string& _operation;
     const int _size;
 };
@@ -101,7 +101,7 @@ BatchRequestQueue::prepareBatchRequest(BasicStream* os)
 }
 
 void
-BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrx& proxy, const std::string& operation)
+BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrxPtr& proxy, const std::string& operation)
 {
     //
     // No need for synchronization, no other threads are supposed
@@ -116,7 +116,11 @@ BatchRequestQueue::finishBatchRequest(BasicStream* os, const Ice::ObjectPrx& pro
 
         if(_maxSize > 0 && _batchStream.b.size() >= _maxSize)
         {
+#ifdef ICE_CPP11_MAPPING
+            proxy->ice_flushBatchRequests_async();
+#else
             proxy->begin_ice_flushBatchRequests();
+#endif
         }
 
         assert(_batchMarker < _batchStream.b.size());
diff --git a/cpp/src/Ice/BatchRequestQueue.h b/cpp/src/Ice/BatchRequestQueue.h
index 6a082af1921..e562e637197 100644
--- a/cpp/src/Ice/BatchRequestQueue.h
+++ b/cpp/src/Ice/BatchRequestQueue.h
@@ -30,7 +30,7 @@ public:
     BatchRequestQueue(const InstancePtr&, bool);
 
     void prepareBatchRequest(BasicStream*);
-    void finishBatchRequest(BasicStream*, const Ice::ObjectPrx&, const std::string&);
+    void finishBatchRequest(BasicStream*, const Ice::ObjectPrxPtr&, const std::string&);
     void abortBatchRequest(BasicStream*);
 
     int swap(BasicStream*);
diff --git a/cpp/src/Ice/CollocatedRequestHandler.cpp b/cpp/src/Ice/CollocatedRequestHandler.cpp
index 6a641c38037..20349210b21 100644
--- a/cpp/src/Ice/CollocatedRequestHandler.cpp
+++ b/cpp/src/Ice/CollocatedRequestHandler.cpp
@@ -35,7 +35,15 @@ public:
               CollocatedRequestHandler* handler,
               Int requestId,
               Int batchRequestNum) :
-        _out(out), _os(os), _handler(handler), _requestId(requestId), _batchRequestNum(batchRequestNum)
+        _out(out),
+        _os(os),
+#ifdef ICE_CPP11_MAPPING
+        _handler(dynamic_pointer_cast<CollocatedRequestHandler>(handler->shared_from_this())),
+#else
+        _handler(handler),
+#endif
+        _requestId(requestId),
+        _batchRequestNum(batchRequestNum)
     {
     }
 
@@ -63,7 +71,7 @@ public:
 
     InvokeAllAsync(const OutgoingAsyncBasePtr& outAsync,
                    BasicStream* os,
-                   CollocatedRequestHandler* handler,
+                   const CollocatedRequestHandlerPtr& handler,
                    Int requestId,
                    Int batchRequestNum) :
         _outAsync(outAsync), _os(os), _handler(handler), _requestId(requestId), _batchRequestNum(batchRequestNum)
@@ -103,7 +111,7 @@ fillInValue(BasicStream* os, int pos, Int value)
 
 CollocatedRequestHandler::CollocatedRequestHandler(const ReferencePtr& ref, const ObjectAdapterPtr& adapter) :
     RequestHandler(ref),
-    _adapter(ObjectAdapterIPtr::dynamicCast(adapter)),
+    _adapter(ICE_DYNAMIC_CAST(ObjectAdapterI, adapter)),
     _dispatcher(_reference->getInstance()->initializationData().dispatcher),
     _logger(_reference->getInstance()->initializationData().logger), // Cached for better performance.
     _traceLevels(_reference->getInstance()->traceLevels()), // Cached for better performance.
@@ -118,7 +126,11 @@ CollocatedRequestHandler::~CollocatedRequestHandler()
 RequestHandlerPtr
 CollocatedRequestHandler::update(const RequestHandlerPtr& previousHandler, const RequestHandlerPtr& newHandler)
 {
+#ifdef ICE_CPP11_MAPPING
+    return previousHandler.get() == this ? newHandler : dynamic_pointer_cast<RequestHandler>(shared_from_this());
+#else
     return previousHandler.get() == this ? newHandler : this;
+#endif
 }
 
 bool
@@ -190,7 +202,7 @@ CollocatedRequestHandler::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAs
         return;
     }
 
-    OutgoingAsyncPtr o = OutgoingAsyncPtr::dynamicCast(outAsync);
+    OutgoingAsyncPtr o = ICE_DYNAMIC_CAST(OutgoingAsync, outAsync);
     if(o)
     {
         for(map<Int, OutgoingAsyncBasePtr>::iterator q = _asyncRequests.begin(); q != _asyncRequests.end(); ++q)
@@ -262,15 +274,32 @@ CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsyncBase* outAsync, int ba
     {
         Lock sync(*this);
 
-        outAsync->cancelable(this); // This will throw if the request is canceled
+        //
+        // This will throw if the request is canceled
+        //
+#ifdef ICE_CPP11_MAPPING
+        outAsync->cancelable(dynamic_pointer_cast<CollocatedRequestHandler>(shared_from_this()));
+#else
+        outAsync->cancelable(this);
+#endif
 
         if(_response)
         {
             requestId = ++_requestId;
+#ifdef ICE_CPP11_MAPPING
+            _asyncRequests.insert(make_pair(requestId, 
+                                            dynamic_pointer_cast<OutgoingAsyncBase>(outAsync->shared_from_this())));
+#else
             _asyncRequests.insert(make_pair(requestId, outAsync));
+#endif
         }
 
+#ifdef ICE_CPP11_MAPPING
+        _sendAsyncRequests.insert(make_pair(
+            dynamic_pointer_cast<OutgoingAsyncBase>(outAsync->shared_from_this()), requestId));
+#else
         _sendAsyncRequests.insert(make_pair(outAsync, requestId));
+#endif
     }
     catch(...)
     {
@@ -280,8 +309,17 @@ CollocatedRequestHandler::invokeAsyncRequest(OutgoingAsyncBase* outAsync, int ba
 
     outAsync->attachCollocatedObserver(_adapter, requestId);
 
+#ifdef ICE_CPP11_MAPPING
+    _adapter->getThreadPool()->dispatch(new InvokeAllAsync(
+                                                dynamic_pointer_cast<OutgoingAsyncBase>(outAsync->shared_from_this()), 
+                                                outAsync->getOs(), 
+                                                dynamic_pointer_cast<CollocatedRequestHandler>(shared_from_this()),
+                                                requestId,
+                                                batchRequestNum));
+#else
     _adapter->getThreadPool()->dispatch(new InvokeAllAsync(outAsync, outAsync->getOs(), this, requestId,
                                                            batchRequestNum));
+#endif
     return AsyncStatusQueued;
 }
 
@@ -392,7 +430,12 @@ CollocatedRequestHandler::sentAsync(OutgoingAsyncBase* outAsync)
 {
     {
         Lock sync(*this);
+#ifdef ICE_CPP11_MAPPING
+        if(_sendAsyncRequests.erase(outAsync ? 
+            dynamic_pointer_cast<IceInternal::OutgoingAsyncBase>(outAsync->shared_from_this()) : nullptr) == 0)
+#else
         if(_sendAsyncRequests.erase(outAsync) == 0)
+#endif
         {
             return false; // The request timed-out.
         }
diff --git a/cpp/src/Ice/CollocatedRequestHandler.h b/cpp/src/Ice/CollocatedRequestHandler.h
index 248984ed647..f98407c0ef3 100644
--- a/cpp/src/Ice/CollocatedRequestHandler.h
+++ b/cpp/src/Ice/CollocatedRequestHandler.h
@@ -19,12 +19,13 @@
 #include <Ice/ObjectAdapterF.h>
 #include <Ice/LoggerF.h>
 #include <Ice/TraceLevelsF.h>
+#include <Ice/VirtualShared.h>
 
 namespace Ice
 {
 
 class ObjectAdapterI;
-typedef IceUtil::Handle<ObjectAdapterI> ObjectAdapterIPtr;
+ICE_DEFINE_PTR(ObjectAdapterIPtr, ObjectAdapterI);
 
 }
 
@@ -36,7 +37,12 @@ class Outgoing;
 class OutgoingAsyncBase;
 class OutgoingAsync;
 
-class CollocatedRequestHandler : public RequestHandler, public ResponseHandler, private IceUtil::Monitor<IceUtil::Mutex>
+class CollocatedRequestHandler : public RequestHandler,
+                                 public ResponseHandler,
+                                 private IceUtil::Monitor<IceUtil::Mutex>
+#ifndef ICE_CPP11_MAPPING
+                                 , public virtual ::IceUtil::Shared
+#endif
 {
 public:
 
@@ -86,7 +92,7 @@ private:
     std::map<Ice::Int, OutgoingBase*> _requests;
     std::map<Ice::Int, OutgoingAsyncBasePtr> _asyncRequests;
 };
-typedef IceUtil::Handle<CollocatedRequestHandler> CollocatedRequestHandlerPtr;
+ICE_DEFINE_PTR(CollocatedRequestHandlerPtr, CollocatedRequestHandler);
 
 }
 
diff --git a/cpp/src/Ice/CommunicatorI.cpp b/cpp/src/Ice/CommunicatorI.cpp
index 985acb23aa9..4fddd5e9e62 100644
--- a/cpp/src/Ice/CommunicatorI.cpp
+++ b/cpp/src/Ice/CommunicatorI.cpp
@@ -56,26 +56,26 @@ Ice::CommunicatorI::isShutdown() const
     return _instance->objectAdapterFactory()->isShutdown();
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::CommunicatorI::stringToProxy(const string& s) const
 {
     return _instance->proxyFactory()->stringToProxy(s);
 }
 
 string
-Ice::CommunicatorI::proxyToString(const ObjectPrx& proxy) const
+Ice::CommunicatorI::proxyToString(const ObjectPrxPtr& proxy) const
 {
     return _instance->proxyFactory()->proxyToString(proxy);
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::CommunicatorI::propertyToProxy(const string& p) const
 {
     return _instance->proxyFactory()->propertyToProxy(p);
 }
 
 PropertyDict
-Ice::CommunicatorI::proxyToProperty(const ObjectPrx& proxy, const string& property) const
+Ice::CommunicatorI::proxyToProperty(const ObjectPrxPtr& proxy, const string& property) const
 {
     return _instance->proxyFactory()->proxyToProperty(proxy, property);
 }
@@ -95,7 +95,7 @@ Ice::CommunicatorI::identityToString(const Identity& ident) const
 ObjectAdapterPtr
 Ice::CommunicatorI::createObjectAdapter(const string& name)
 {
-    return _instance->objectAdapterFactory()->createObjectAdapter(name, 0);
+    return _instance->objectAdapterFactory()->createObjectAdapter(name, ICE_NULLPTR);
 }
 
 ObjectAdapterPtr
@@ -108,11 +108,11 @@ Ice::CommunicatorI::createObjectAdapterWithEndpoints(const string& name, const s
     }
 
     getProperties()->setProperty(oaName + ".Endpoints", endpoints);
-    return _instance->objectAdapterFactory()->createObjectAdapter(oaName, 0);
+    return _instance->objectAdapterFactory()->createObjectAdapter(oaName, ICE_NULLPTR);
 }
 
 ObjectAdapterPtr
-Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const RouterPrx& router)
+Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const RouterPrxPtr& router)
 {
     string oaName = name;
     if(oaName.empty())
@@ -129,17 +129,31 @@ Ice::CommunicatorI::createObjectAdapterWithRouter(const string& name, const Rout
     return _instance->objectAdapterFactory()->createObjectAdapter(oaName, router);
 }
 
+#ifdef ICE_CPP11_MAPPING
 void
-Ice::CommunicatorI::addObjectFactory(const ObjectFactoryPtr& factory, const string& id)
+Ice::CommunicatorI::addObjectFactory(function<::Ice::ValuePtr (const string&)> factory, const string& id)
+{
+        _instance->servantFactoryManager()->add(move(factory), id);
+}
+
+function<::Ice::ValuePtr (const string&)>
+Ice::CommunicatorI::findObjectFactory(const string& id) const
+{
+    return _instance->servantFactoryManager()->find(id);
+}
+#else
+void
+Ice::CommunicatorI::addObjectFactory(const ::Ice::ObjectFactoryPtr& factory, const string& id)
 {
     _instance->servantFactoryManager()->add(factory, id);
 }
 
-ObjectFactoryPtr
+::Ice::ObjectFactoryPtr
 Ice::CommunicatorI::findObjectFactory(const string& id) const
 {
     return _instance->servantFactoryManager()->find(id);
 }
+#endif
 
 PropertiesPtr
 Ice::CommunicatorI::getProperties() const
@@ -159,26 +173,26 @@ Ice::CommunicatorI::getObserver() const
     return _instance->initializationData().observer;
 }
 
-RouterPrx
+RouterPrxPtr
 Ice::CommunicatorI::getDefaultRouter() const
 {
     return _instance->referenceFactory()->getDefaultRouter();
 }
 
 void
-Ice::CommunicatorI::setDefaultRouter(const RouterPrx& router)
+Ice::CommunicatorI::setDefaultRouter(const RouterPrxPtr& router)
 {
     _instance->setDefaultRouter(router);
 }
 
-LocatorPrx
+LocatorPrxPtr
 Ice::CommunicatorI::getDefaultLocator() const
 {
     return _instance->referenceFactory()->getDefaultLocator();
 }
 
 void
-Ice::CommunicatorI::setDefaultLocator(const LocatorPrx& locator)
+Ice::CommunicatorI::setDefaultLocator(const LocatorPrxPtr& locator)
 {
     _instance->setDefaultLocator(locator);
 }
@@ -195,6 +209,117 @@ Ice::CommunicatorI::getPluginManager() const
     return _instance->pluginManager();
 }
 
+namespace
+{
+
+const ::std::string __flushBatchRequests_name = "flushBatchRequests";
+
+}
+
+#ifdef ICE_CPP11_MAPPING
+void
+Ice::CommunicatorI::flushBatchRequests()
+{
+    promise<bool> promise;
+    flushBatchRequests_async(
+        nullptr,
+        [&](exception_ptr ex)
+        {
+            promise.set_exception(move(ex));
+        },
+        [&](bool sentSynchronously)
+        {
+            promise.set_value(sentSynchronously);
+        });
+    promise.get_future().get();
+}
+
+::std::function<void ()>
+Ice::CommunicatorI::flushBatchRequests_async(
+    function<void ()> completed,
+    function<void (exception_ptr)> exception,
+    function<void (bool)> sent)
+{
+    class FlushBatchRequestsCallback : public CallbackBase
+    {
+    public:
+        
+        FlushBatchRequestsCallback(function<void (exception_ptr)> exception,
+                                   function<void (bool)> sent, 
+                                   shared_ptr<Communicator> communicator) :
+            _exception(move(exception)),
+            _sent(move(sent)),
+            _communicator(move(communicator))
+        {
+        }
+        
+        virtual void sent(const AsyncResultPtr& result) const
+        {
+            try
+            {
+                AsyncResult::__check(result, _communicator.get(), __flushBatchRequests_name);
+                result->__wait();
+            }
+            catch(const ::Ice::Exception&)
+            {
+                _exception(current_exception());
+            }
+            
+            if(_sent)
+            {
+                _sent(result->sentSynchronously());
+            }
+        }
+        
+        virtual bool hasSentCallback() const
+        {
+            return true;
+        }
+
+        
+        virtual void
+        completed(const ::Ice::AsyncResultPtr& result) const
+        {
+            try
+            {
+                AsyncResult::__check(result, _communicator.get(), __flushBatchRequests_name);
+                result->__wait();
+            }
+            catch(const ::Ice::Exception&)
+            {
+                _exception(current_exception());
+            }
+        }
+
+    private:
+
+        function<void (exception_ptr)> _exception;
+        function<void (bool)> _sent;
+        shared_ptr<Communicator> _communicator;
+    };
+    
+    OutgoingConnectionFactoryPtr connectionFactory = _instance->outgoingConnectionFactory();
+    ObjectAdapterFactoryPtr adapterFactory = _instance->objectAdapterFactory();
+    
+    auto self = dynamic_pointer_cast<CommunicatorI>(shared_from_this());
+    
+    auto result = make_shared<CommunicatorFlushBatchAsync>(self, _instance, __flushBatchRequests_name,
+        make_shared<FlushBatchRequestsCallback>(move(exception), move(sent), self));
+    
+    connectionFactory->flushAsyncBatchRequests(result);
+    adapterFactory->flushAsyncBatchRequests(result);
+
+    //
+    // Inform the callback that we have finished initiating all of the
+    // flush requests.
+    //
+    result->ready();
+    return [result]()
+        {
+            result->cancel();
+        };
+}
+#else
 void
 Ice::CommunicatorI::flushBatchRequests()
 {
@@ -224,7 +349,7 @@ AsyncResultPtr
 Ice::CommunicatorI::begin_flushBatchRequests(const IceInternal::Function<void (const Exception&)>& exception,
                                              const IceInternal::Function<void (bool)>& sent)
 {
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     class Cpp11CB : public IceInternal::Cpp11FnCallbackNC
     {
 
@@ -254,20 +379,13 @@ Ice::CommunicatorI::begin_flushBatchRequests(const IceInternal::Function<void (c
         }
     };
 
-    return __begin_flushBatchRequests(new Cpp11CB(exception, sent), 0);
+    return __begin_flushBatchRequests(ICE_MAKE_SHARED(Cpp11CB, exception, sent), 0);
 #else
     assert(false); // Ice not built with C++11 support.
     return 0;
 #endif
 }
 
-namespace
-{
-
-const ::std::string __flushBatchRequests_name = "flushBatchRequests";
-
-}
-
 AsyncResultPtr
 Ice::CommunicatorI::__begin_flushBatchRequests(const IceInternal::CallbackBasePtr& cb, const LocalObjectPtr& cookie)
 {
@@ -278,7 +396,7 @@ Ice::CommunicatorI::__begin_flushBatchRequests(const IceInternal::CallbackBasePt
     // This callback object receives the results of all invocations
     // of Connection::begin_flushBatchRequests.
     //
-    CommunicatorFlushBatchAsyncPtr result = new CommunicatorFlushBatchAsync(this,
+    CommunicatorFlushBatchAsyncPtr result = new CommunicatorFlushBatchAsync(ICE_SHARED_FROM_THIS,
                                                                             _instance,
                                                                             __flushBatchRequests_name,
                                                                             cb,
@@ -302,13 +420,14 @@ Ice::CommunicatorI::end_flushBatchRequests(const AsyncResultPtr& r)
     AsyncResult::__check(r, this, __flushBatchRequests_name);
     r->__wait();
 }
+#endif
 
-ObjectPrx
+ObjectPrxPtr
 Ice::CommunicatorI::createAdmin(const ObjectAdapterPtr& adminAdapter, const Identity& adminId)
 {
     return _instance->createAdmin(adminAdapter, adminId);
 }
-ObjectPrx
+ObjectPrxPtr
 Ice::CommunicatorI::getAdmin() const
 {
     return _instance->getAdmin();
@@ -338,27 +457,27 @@ Ice::CommunicatorI::findAllAdminFacets()
     return _instance->findAllAdminFacets();
 }
 
-Ice::CommunicatorI::CommunicatorI(const InitializationData& initData)
+CommunicatorIPtr
+Ice::CommunicatorI::create(const InitializationData& initData)
 {
-    __setNoDelete(true);
+    Ice::CommunicatorIPtr communicator = ICE_MAKE_SHARED(CommunicatorI);
     try
     {
-        const_cast<InstancePtr&>(_instance) = new Instance(this, initData);
+        const_cast<InstancePtr&>(communicator->_instance) = new Instance(communicator, initData);
 
         //
         // Keep a reference to the dynamic library list to ensure
         // the libraries are not unloaded until this Communicator's
         // destructor is invoked.
         //
-        const_cast<DynamicLibraryListPtr&>(_dynamicLibraryList) = _instance->dynamicLibraryList();
+        const_cast<DynamicLibraryListPtr&>(communicator->_dynamicLibraryList) = communicator->_instance->dynamicLibraryList();
     }
     catch(...)
     {
-        destroy();
-        __setNoDelete(false);
+        communicator->destroy();
         throw;
     }
-    __setNoDelete(false);
+    return communicator;
 }
 
 Ice::CommunicatorI::~CommunicatorI()
@@ -375,7 +494,7 @@ Ice::CommunicatorI::finishSetup(int& argc, char* argv[])
 {
     try
     {
-        _instance->finishSetup(argc, argv, this);
+        _instance->finishSetup(argc, argv, ICE_SHARED_FROM_THIS);
     }
     catch(...)
     {
diff --git a/cpp/src/Ice/CommunicatorI.h b/cpp/src/Ice/CommunicatorI.h
index 373a56c316e..d0ba4285695 100644
--- a/cpp/src/Ice/CommunicatorI.h
+++ b/cpp/src/Ice/CommunicatorI.h
@@ -20,30 +20,39 @@
 namespace Ice
 {
 
-class CommunicatorI : public Communicator
+class CommunicatorI;
+ICE_DEFINE_PTR(CommunicatorIPtr, CommunicatorI);
+
+class CommunicatorI : public ICE_ENABLE_SHARED_FROM_THIS(CommunicatorI),
+                      public Communicator
 {
 public:
-    
+
     virtual void destroy();
     virtual void shutdown();
     virtual void waitForShutdown();
     virtual bool isShutdown() const;
 
-    virtual ObjectPrx stringToProxy(const std::string&) const;
-    virtual std::string proxyToString(const ObjectPrx&) const;
+    virtual ObjectPrxPtr stringToProxy(const std::string&) const;
+    virtual std::string proxyToString(const ObjectPrxPtr&) const;
 
-    virtual ObjectPrx propertyToProxy(const std::string&) const;
-    virtual PropertyDict proxyToProperty(const ObjectPrx&, const std::string&) const;
+    virtual ObjectPrxPtr propertyToProxy(const std::string&) const;
+    virtual PropertyDict proxyToProperty(const ObjectPrxPtr&, const std::string&) const;
 
     virtual Identity stringToIdentity(const std::string&) const;
     virtual std::string identityToString(const Identity&) const;
 
     virtual ObjectAdapterPtr createObjectAdapter(const std::string&);
     virtual ObjectAdapterPtr createObjectAdapterWithEndpoints(const std::string&, const std::string&);
-    virtual ObjectAdapterPtr createObjectAdapterWithRouter(const std::string&, const RouterPrx&);
+    virtual ObjectAdapterPtr createObjectAdapterWithRouter(const std::string&, const RouterPrxPtr&);
 
+#ifdef ICE_CPP11_MAPPING
+    virtual void addObjectFactory(std::function<std::shared_ptr<Ice::Value> (const std::string&)>, const std::string&);    
+    virtual std::function<::std::shared_ptr<Ice::Value> (const std::string&)> findObjectFactory(const std::string&) const;
+#else
     virtual void addObjectFactory(const ObjectFactoryPtr&, const std::string&);
     virtual ObjectFactoryPtr findObjectFactory(const std::string&) const;
+#endif
 
     virtual ImplicitContextPtr getImplicitContext() const;
 
@@ -51,16 +60,23 @@ public:
     virtual LoggerPtr getLogger() const;
     virtual Ice::Instrumentation::CommunicatorObserverPtr getObserver() const;
 
-    virtual RouterPrx getDefaultRouter() const;
-    virtual void setDefaultRouter(const RouterPrx&);
+    virtual RouterPrxPtr getDefaultRouter() const;
+    virtual void setDefaultRouter(const RouterPrxPtr&);
 
-    virtual LocatorPrx getDefaultLocator() const;
-    virtual void setDefaultLocator(const LocatorPrx&);
+    virtual LocatorPrxPtr getDefaultLocator() const;
+    virtual void setDefaultLocator(const LocatorPrxPtr&);
 
     virtual PluginManagerPtr getPluginManager() const;
 
     virtual void flushBatchRequests();
 
+#ifdef ICE_CPP11_MAPPING
+    virtual ::std::function<void ()>
+    flushBatchRequests_async(
+        ::std::function<void ()> completed,
+        ::std::function<void (std::exception_ptr)> exception = nullptr,
+        ::std::function<void (bool)> sent = nullptr);
+#else
     virtual AsyncResultPtr begin_flushBatchRequests();
     virtual AsyncResultPtr begin_flushBatchRequests(const CallbackPtr&, const LocalObjectPtr& = 0);
     virtual AsyncResultPtr begin_flushBatchRequests(const Callback_Communicator_flushBatchRequestsPtr&,
@@ -71,18 +87,21 @@ public:
         const IceInternal::Function<void (bool)>& = IceInternal::Function<void (bool)>());
 
     virtual void end_flushBatchRequests(const AsyncResultPtr&);
+#endif
 
-    virtual ObjectPrx createAdmin(const ObjectAdapterPtr&, const Identity&);
-    virtual ObjectPrx getAdmin() const;
+    virtual ObjectPrxPtr createAdmin(const ObjectAdapterPtr&, const Identity&);
+    virtual ObjectPrxPtr getAdmin() const;
     virtual void addAdminFacet(const ObjectPtr&, const std::string&);
     virtual ObjectPtr removeAdminFacet(const std::string&);
     virtual ObjectPtr findAdminFacet(const std::string&);
     virtual FacetMap findAllAdminFacets();
 
+    virtual ~CommunicatorI();
+
 private:
 
-    CommunicatorI(const InitializationData&);
-    virtual ~CommunicatorI();
+    static CommunicatorIPtr
+    create(const InitializationData&);
 
     //
     // Certain initialization tasks need to be completed after the
diff --git a/cpp/src/Ice/ConnectRequestHandler.cpp b/cpp/src/Ice/ConnectRequestHandler.cpp
index caabcbd3e75..3818144f279 100644
--- a/cpp/src/Ice/ConnectRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectRequestHandler.cpp
@@ -23,9 +23,11 @@
 using namespace std;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(ConnectRequestHandler* p) { return p; }
+#endif
 
-ConnectRequestHandler::ConnectRequestHandler(const ReferencePtr& ref, const Ice::ObjectPrx& proxy) :
+ConnectRequestHandler::ConnectRequestHandler(const ReferencePtr& ref, const Ice::ObjectPrxPtr& proxy) :
     RequestHandler(ref),
     _proxy(proxy),
     _initialized(false),
@@ -33,25 +35,21 @@ ConnectRequestHandler::ConnectRequestHandler(const ReferencePtr& ref, const Ice:
 {
 }
 
-ConnectRequestHandler::~ConnectRequestHandler()
-{
-}
-
 RequestHandlerPtr
-ConnectRequestHandler::connect(const Ice::ObjectPrx& proxy)
+ConnectRequestHandler::connect(const Ice::ObjectPrxPtr& proxy)
 {
     Lock sync(*this);
     if(!initialized())
     {
         _proxies.insert(proxy);
     }
-    return _requestHandler ? _requestHandler : this;
+    return _requestHandler ? _requestHandler : ICE_SHARED_FROM_THIS;
 }
 
 RequestHandlerPtr
 ConnectRequestHandler::update(const RequestHandlerPtr& previousHandler, const RequestHandlerPtr& newHandler)
 {
-    return previousHandler.get() == this ? newHandler : this;
+    return previousHandler.get() == this ? newHandler : ICE_SHARED_FROM_THIS;
 }
 
 bool
@@ -77,7 +75,7 @@ ConnectRequestHandler::sendAsyncRequest(const ProxyOutgoingAsyncBasePtr& out)
         Lock sync(*this);
         if(!_initialized)
         {
-            out->cancelable(this); // This will throw if the request is canceled
+            out->cancelable(ICE_SHARED_FROM_THIS); // This will throw if the request is canceled
         }
 
         if(!initialized())
@@ -205,7 +203,11 @@ ConnectRequestHandler::setConnection(const Ice::ConnectionIPtr& connection, bool
     // add this proxy to the router info object.
     //
     RouterInfoPtr ri = _reference->getRouterInfo();
+#ifdef ICE_CPP11_MAPPING
+    if(ri && !ri->addProxy(_proxy, dynamic_pointer_cast<AddProxyCallback>(shared_from_this())))
+#else
     if(ri && !ri->addProxy(_proxy, this))
+#endif
     {
         return; // The request handler will be initialized once addProxy returns.
     }
@@ -233,7 +235,7 @@ ConnectRequestHandler::setException(const Ice::LocalException& ex)
     //
     try
     {
-        _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, this);
+        _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, ICE_SHARED_FROM_THIS);
     }
     catch(const Ice::CommunicatorDestroyedException&)
     {
@@ -342,7 +344,7 @@ ConnectRequestHandler::flushRequests()
             exception.reset(ex.get()->ice_clone());
 
             // Remove the request handler before retrying.
-            _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, this);
+            _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, ICE_SHARED_FROM_THIS);
 
             if(req.out)
             {
@@ -376,10 +378,10 @@ ConnectRequestHandler::flushRequests()
     //
     if(_reference->getCacheConnection() && !exception.get())
     {
-        _requestHandler = new ConnectionRequestHandler(_reference, _connection, _compress);
-        for(set<Ice::ObjectPrx>::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p)
+        _requestHandler = ICE_MAKE_SHARED(ConnectionRequestHandler, _reference, _connection, _compress);
+        for(set<Ice::ObjectPrxPtr>::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p)
         {
-            (*p)->__updateRequestHandler(this, _requestHandler);
+            (*p)->__updateRequestHandler(ICE_SHARED_FROM_THIS, _requestHandler);
         }
     }
 
@@ -394,10 +396,11 @@ ConnectRequestHandler::flushRequests()
         // Only remove once all the requests are flushed to
         // guarantee serialization.
         //
-        _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, this);
+        _reference->getInstance()->requestHandlerFactory()->removeRequestHandler(_reference, ICE_SHARED_FROM_THIS);
 
         _proxies.clear();
         _proxy = 0; // Break cyclic reference count.
         notifyAll();
     }
 }
+
diff --git a/cpp/src/Ice/ConnectRequestHandler.h b/cpp/src/Ice/ConnectRequestHandler.h
index fc202d1c893..e8d61faa379 100644
--- a/cpp/src/Ice/ConnectRequestHandler.h
+++ b/cpp/src/Ice/ConnectRequestHandler.h
@@ -30,14 +30,14 @@ namespace IceInternal
 class ConnectRequestHandler : public RequestHandler,
                               public Reference::GetConnectionCallback,
                               public RouterInfo::AddProxyCallback,
-                              public IceUtil::Monitor<IceUtil::Mutex>
+                              public IceUtil::Monitor<IceUtil::Mutex>,
+                              public ICE_ENABLE_SHARED_FROM_THIS(ConnectRequestHandler)
 {
 public:
 
-    ConnectRequestHandler(const ReferencePtr&, const Ice::ObjectPrx&);
-    virtual ~ConnectRequestHandler();
+    ConnectRequestHandler(const ReferencePtr&, const Ice::ObjectPrxPtr&);
 
-    RequestHandlerPtr connect(const Ice::ObjectPrx&);
+    RequestHandlerPtr connect(const Ice::ObjectPrxPtr&);
     virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&);
 
     virtual bool sendRequest(ProxyOutgoingBase*);
@@ -69,8 +69,8 @@ private:
         ProxyOutgoingAsyncBasePtr outAsync;
     };
 
-    Ice::ObjectPrx _proxy;
-    std::set<Ice::ObjectPrx> _proxies;
+    Ice::ObjectPrxPtr _proxy;
+    std::set<Ice::ObjectPrxPtr> _proxies;
 
     Ice::ConnectionIPtr _connection;
     bool _compress;
diff --git a/cpp/src/Ice/ConnectRequestHandlerF.h b/cpp/src/Ice/ConnectRequestHandlerF.h
index f60cdaa1804..054567aae84 100644
--- a/cpp/src/Ice/ConnectRequestHandlerF.h
+++ b/cpp/src/Ice/ConnectRequestHandlerF.h
@@ -17,8 +17,12 @@ namespace IceInternal
 {
 
 class ConnectRequestHandler;
+#ifdef ICE_CPP11_MAPPING
+typedef ::std::shared_ptr<ConnectRequestHandler> ConnectRequestHandlerPtr;
+#else
 ICE_API IceUtil::Shared* upCast(ConnectRequestHandler*);
 typedef IceInternal::Handle<ConnectRequestHandler> ConnectRequestHandlerPtr;
+#endif
 
 }
 
diff --git a/cpp/src/Ice/ConnectionFactory.cpp b/cpp/src/Ice/ConnectionFactory.cpp
index 3dbef2a5a6d..6ce8b78d45e 100644
--- a/cpp/src/Ice/ConnectionFactory.cpp
+++ b/cpp/src/Ice/ConnectionFactory.cpp
@@ -44,7 +44,10 @@ using namespace Ice::Instrumentation;
 using namespace IceInternal;
 
 IceUtil::Shared* IceInternal::upCast(OutgoingConnectionFactory* p) { return p; }
+
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(IncomingConnectionFactory* p) { return p; }
+#endif
 
 namespace
 {
@@ -57,6 +60,38 @@ struct RandomNumberGenerator : public std::unary_function<ptrdiff_t, ptrdiff_t>
     }
 };
 
+#ifdef ICE_CPP11_MAPPING
+template <typename Map> void
+remove(Map& m, const typename Map::key_type& k, const typename Map::mapped_type& v)
+{
+    auto pr = m.equal_range(k);
+    assert(pr.first != pr.second);
+    for(auto q = pr.first; q != pr.second; ++q)
+    {
+        if(q->second.get() == v.get())
+        {
+            m.erase(q);
+            return;
+        }
+    }
+    assert(false); // Nothing was removed which is an error.
+}
+
+template<typename Map> typename Map::mapped_type
+find(const Map& m, const typename Map::key_type& k, function<bool (const typename Map::mapped_type&)> predicate)
+{
+    auto pr = m.equal_range(k);
+    for(auto q = pr.first; q != pr.second; ++q)
+    {
+        if(predicate(q->second))
+        {
+            return q->second;
+        }
+    }
+    return nullptr;
+}
+
+#else
 template <typename K, typename V> void
 remove(multimap<K, V>& m, K k, V v)
 {
@@ -89,6 +124,7 @@ find(const multimap<K,::IceInternal::Handle<V> >& m,
     }
     return IceInternal::Handle<V>();
 }
+#endif
 
 }
 
@@ -198,7 +234,11 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointIPtr>& endpt
         return;
     }
 
+#ifdef ICE_CPP11_MAPPING
+    auto cb = make_shared<ConnectCallback>(_instance, this, endpoints, hasMore, callback, selType);
+#else
     ConnectCallbackPtr cb = new ConnectCallback(_instance, this, endpoints, hasMore, callback, selType);
+#endif
     cb->getConnectors();
 }
 
@@ -545,8 +585,8 @@ IceInternal::OutgoingConnectionFactory::createConnection(const TransceiverPtr& t
             throw Ice::CommunicatorDestroyedException(__FILE__, __LINE__);
         }
 
-        connection = new ConnectionI(_communicator, _instance, _monitor, transceiver, ci.connector,
-                                     ci.endpoint->compress(false), 0);
+        connection = ConnectionI::create(_communicator, _instance, _monitor, transceiver, ci.connector,
+                                         ci.endpoint->compress(false), ICE_NULLPTR);
     }
     catch(const Ice::LocalException&)
     {
@@ -827,7 +867,12 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::connectionStartComplete
     }
 
     connection->activate();
+#ifdef ICE_CPP11_MAPPING
+    _factory->finishGetConnection(_connectors, *_iter, connection,
+                                  dynamic_pointer_cast<ConnectCallback>(shared_from_this()));
+#else
     _factory->finishGetConnection(_connectors, *_iter, connection, this);
+#endif
 }
 
 void
@@ -845,7 +890,11 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::connectionStartFailed(c
     _factory->handleConnectionException(ex, _hasMore || _iter != _connectors.end() - 1);
     if(dynamic_cast<const Ice::CommunicatorDestroyedException*>(&ex)) // No need to continue.
     {
+#ifdef ICE_CPP11_MAPPING
+        _factory->finishGetConnection(_connectors, ex, dynamic_pointer_cast<ConnectCallback>(shared_from_this()));
+#else
         _factory->finishGetConnection(_connectors, ex, this);
+#endif
     }
     else if(++_iter != _connectors.end()) // Try the next connector.
     {
@@ -853,7 +902,11 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::connectionStartFailed(c
     }
     else
     {
+#ifdef ICE_CPP11_MAPPING
+        _factory->finishGetConnection(_connectors, ex, dynamic_pointer_cast<ConnectCallback>(shared_from_this()));
+#else
         _factory->finishGetConnection(_connectors, ex, this);
+#endif
     }
 }
 
@@ -936,7 +989,8 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::nextEndpoint()
     try
     {
         assert(_endpointsIter != _endpoints.end());
-        (*_endpointsIter)->connectors_async(_selType, this);
+        (*_endpointsIter)->connectors_async(_selType, ICE_SHARED_FROM_THIS);
+
     }
     catch(const Ice::LocalException& ex)
     {
@@ -954,7 +1008,14 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::getConnection()
         // connection.
         //
         bool compress;
+#ifdef ICE_CPP11_MAPPING
+        Ice::ConnectionIPtr connection = _factory->getConnection(
+                                                            _connectors, 
+                                                            dynamic_pointer_cast<ConnectCallback>(shared_from_this()),
+                                                            compress);
+#else
         Ice::ConnectionIPtr connection = _factory->getConnection(_connectors, this, compress);
+#endif
         if(!connection)
         {
             //
@@ -982,7 +1043,6 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::nextConnector()
     Ice::ConnectionIPtr connection;
     try
     {
-
         const CommunicatorObserverPtr& obsv = _factory->_instance->initializationData().observer;
         if(obsv)
         {
@@ -1002,7 +1062,7 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::nextConnector()
                 << _iter->connector->toString();
         }
         connection = _factory->createConnection(_iter->connector->connect(), *_iter);
-        connection->start(this);
+        connection->start(ICE_SHARED_FROM_THIS);
     }
     catch(const Ice::LocalException& ex)
     {
@@ -1062,7 +1122,11 @@ IceInternal::OutgoingConnectionFactory::ConnectCallback::removeConnectors(const
 void
 IceInternal::OutgoingConnectionFactory::ConnectCallback::removeFromPending()
 {
+#ifdef ICE_CPP11_MAPPING
+    _factory->removeFromPending(dynamic_pointer_cast<ConnectCallback>(shared_from_this()), _connectors);
+#else
     _factory->removeFromPending(this, _connectors);
+#endif
 }
 
 bool
@@ -1345,8 +1409,8 @@ IceInternal::IncomingConnectionFactory::message(ThreadPoolCurrent& current)
 
         try
         {
-            connection = new ConnectionI(_adapter->getCommunicator(), _instance, _monitor, transceiver, 0, _endpoint,
-                                         _adapter);
+            connection = ConnectionI::create(_adapter->getCommunicator(), _instance, _monitor, transceiver, 0,
+                                             _endpoint, _adapter);
         }
         catch(const LocalException& ex)
         {
@@ -1371,7 +1435,11 @@ IceInternal::IncomingConnectionFactory::message(ThreadPoolCurrent& current)
     }
 
     assert(connection);
+#ifdef ICE_CPP11_MAPPING
+    connection->start(dynamic_pointer_cast<IncomingConnectionFactory>(shared_from_this()));
+#else
     connection->start(this);
+#endif
 }
 
 void
@@ -1545,7 +1613,6 @@ IceInternal::IncomingConnectionFactory::initialize()
     {
         _endpoint = _endpoint->compress(_instance->defaultsAndOverrides()->overrideCompressValue);
     }
-
     try
     {
         const_cast<TransceiverPtr&>(_transceiver) = _endpoint->transceiver();
@@ -1557,9 +1624,8 @@ IceInternal::IncomingConnectionFactory::initialize()
                 out << "attempting to bind to " << _endpoint->protocol() << " socket\n" << _transceiver->toString();
             }
             const_cast<EndpointIPtr&>(_endpoint) = _transceiver->bind();
-
-            ConnectionIPtr connection = new ConnectionI(_adapter->getCommunicator(), _instance, 0, _transceiver, 0,
-                                                        _endpoint, _adapter);
+            ConnectionIPtr connection(ConnectionI::create(_adapter->getCommunicator(), _instance, 0, _transceiver, 0,
+                                                          _endpoint, _adapter));
             connection->start(0);
             _connections.insert(connection);
         }
@@ -1627,7 +1693,12 @@ IceInternal::IncomingConnectionFactory::setState(State state)
                     Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
                     out << "accepting " << _endpoint->protocol() << " connections at " << _acceptor->toString();
                 }
+#ifdef ICE_CPP11_MAPPING
+                _adapter->getThreadPool()->_register(dynamic_pointer_cast<EventHandler>(shared_from_this()),
+                                                     SocketOperationRead);
+#else
                 _adapter->getThreadPool()->_register(this, SocketOperationRead);
+#endif
             }
             for_each(_connections.begin(), _connections.end(), Ice::voidMemFun(&ConnectionI::activate));
             break;
@@ -1646,7 +1717,12 @@ IceInternal::IncomingConnectionFactory::setState(State state)
                     Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
                     out << "holding " << _endpoint->protocol() << " connections at " << _acceptor->toString();
                 }
+#ifdef ICE_CPP11_MAPPING
+                _adapter->getThreadPool()->unregister(dynamic_pointer_cast<EventHandler>(shared_from_this()),
+                                                      SocketOperationRead);
+#else
                 _adapter->getThreadPool()->unregister(this, SocketOperationRead);
+#endif
             }
             for_each(_connections.begin(), _connections.end(), Ice::voidMemFun(&ConnectionI::hold));
             break;
@@ -1663,7 +1739,11 @@ IceInternal::IncomingConnectionFactory::setState(State state)
                 // the finish() call. Not all selector implementations do support this
                 // however.
                 //
+#ifdef ICE_CPP11_MAPPING
+                if(_adapter->getThreadPool()->finish(dynamic_pointer_cast<EventHandler>(shared_from_this()), true))
+#else
                 if(_adapter->getThreadPool()->finish(this, true))
+#endif
                 {
                     closeAcceptor();
                 }
@@ -1696,7 +1776,6 @@ IceInternal::IncomingConnectionFactory::createAcceptor()
     {
         _acceptor = _endpoint->acceptor(_adapter->getName());
         assert(_acceptor);
-
         if(_instance->traceLevels()->network >= 2)
         {
             Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
@@ -1704,18 +1783,25 @@ IceInternal::IncomingConnectionFactory::createAcceptor()
         }
 
         _endpoint = _acceptor->listen();
-
         if(_instance->traceLevels()->network >= 1)
         {
             Trace out(_instance->initializationData().logger, _instance->traceLevels()->networkCat);
             out << "listening for " << _endpoint->protocol() << " connections\n" << _acceptor->toDetailedString();
         }
 
+#ifdef ICE_CPP11_MAPPING
+        _adapter->getThreadPool()->initialize(dynamic_pointer_cast<EventHandler>(shared_from_this()));
+#else
         _adapter->getThreadPool()->initialize(this);
-
+#endif
         if(_state == StateActive)
         {
+#ifdef ICE_CPP11_MAPPING
+            _adapter->getThreadPool()->_register(dynamic_pointer_cast<EventHandler>(shared_from_this()),
+                                                 SocketOperationRead);
+#else
             _adapter->getThreadPool()->_register(this, SocketOperationRead);
+#endif
         }
     }
     catch(const Ice::Exception&)
diff --git a/cpp/src/Ice/ConnectionFactory.h b/cpp/src/Ice/ConnectionFactory.h
index bf211972ec8..433d5dbafe2 100644
--- a/cpp/src/Ice/ConnectionFactory.h
+++ b/cpp/src/Ice/ConnectionFactory.h
@@ -27,6 +27,7 @@
 #include <Ice/EndpointI.h>
 #include <Ice/InstrumentationF.h>
 #include <Ice/ACMF.h>
+#include <Ice/Comparable.h>
 
 #include <list>
 #include <set>
@@ -36,7 +37,7 @@ namespace Ice
 
 class LocalException;
 class ObjectAdapterI;
-typedef IceUtil::Handle<ObjectAdapterI> ObjectAdapterIPtr;
+ICE_DEFINE_PTR(ObjectAdapterIPtr, ObjectAdapterI);
 
 }
 
@@ -68,11 +69,11 @@ public:
     void removeAdapter(const Ice::ObjectAdapterPtr&);
     void flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr&);
 
-private:
-
     OutgoingConnectionFactory(const Ice::CommunicatorPtr&, const InstancePtr&);
     virtual ~OutgoingConnectionFactory();
     friend class Instance;
+    
+private:
 
     struct ConnectorInfo
     {
@@ -86,7 +87,11 @@ private:
         EndpointIPtr endpoint;
     };
 
-    class ConnectCallback : public Ice::ConnectionI::StartCallback, public IceInternal::EndpointI_connectors
+    class ConnectCallback : public Ice::ConnectionI::StartCallback,
+                            public IceInternal::EndpointI_connectors
+#ifdef ICE_CPP11_MAPPING
+                    , public ::std::enable_shared_from_this<::IceInternal::OutgoingConnectionFactory::ConnectCallback>
+#endif
     {
     public:
 
@@ -127,7 +132,7 @@ private:
         std::vector<ConnectorInfo> _connectors;
         std::vector<ConnectorInfo>::const_iterator _iter;
     };
-    typedef IceUtil::Handle<ConnectCallback> ConnectCallbackPtr;
+    ICE_DEFINE_PTR(ConnectCallbackPtr, ConnectCallback);
     friend class ConnectCallback;
 
     std::vector<EndpointIPtr> applyOverrides(const std::vector<EndpointIPtr>&);
@@ -156,7 +161,11 @@ private:
     std::multimap<ConnectorPtr, Ice::ConnectionIPtr> _connections;
     std::map<ConnectorPtr, std::set<ConnectCallbackPtr> > _pending;
 
+#ifdef ICE_CPP11_MAPPING
+    std::multimap<EndpointIPtr, Ice::ConnectionIPtr, Ice::TargetLess<EndpointIPtr>> _connectionsByEndpoint;
+#else
     std::multimap<EndpointIPtr, Ice::ConnectionIPtr> _connectionsByEndpoint;
+#endif
     int _pendingConnectCount;
 };
 
@@ -201,11 +210,12 @@ public:
     virtual void connectionStartCompleted(const Ice::ConnectionIPtr&);
     virtual void connectionStartFailed(const Ice::ConnectionIPtr&, const Ice::LocalException&);
 
-private:
-
     IncomingConnectionFactory(const InstancePtr&, const EndpointIPtr&, const Ice::ObjectAdapterIPtr&);
     void initialize();
     virtual ~IncomingConnectionFactory();
+    
+private:
+
     friend class Ice::ObjectAdapterI;
 
     enum State
diff --git a/cpp/src/Ice/ConnectionI.cpp b/cpp/src/Ice/ConnectionI.cpp
index 4a078bcc1f8..a824fbf0107 100644
--- a/cpp/src/Ice/ConnectionI.cpp
+++ b/cpp/src/Ice/ConnectionI.cpp
@@ -38,7 +38,9 @@ using namespace Ice;
 using namespace Ice::Instrumentation;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 Ice::LocalObject* Ice::upCast(ConnectionI* p) { return p; }
+#endif
 
 namespace
 {
@@ -353,7 +355,12 @@ Ice::ConnectionI::start(const StartCallbackPtr& callback)
         exception(ex);
         if(callback)
         {
+#ifdef ICE_CPP11_MAPPING
+            callback->connectionStartFailed(dynamic_pointer_cast<ConnectionI>(shared_from_this()),
+                                            *_exception.get());
+#else
             callback->connectionStartFailed(this, *_exception.get());
+#endif
             return;
         }
         else
@@ -365,7 +372,11 @@ Ice::ConnectionI::start(const StartCallbackPtr& callback)
 
     if(callback)
     {
+#ifdef ICE_CPP11_MAPPING
+        callback->connectionStartCompleted(dynamic_pointer_cast<ConnectionI>(shared_from_this()));
+#else
         callback->connectionStartCompleted(this);
+#endif
     }
 }
 
@@ -725,8 +736,11 @@ Ice::ConnectionI::sendAsyncRequest(const OutgoingAsyncBasePtr& out, bool compres
     // Notify the request that it's cancelable with this connection.
     // This will throw if the request is canceled.
     //
+#ifdef ICE_CPP11_MAPPING
+    out->cancelable(dynamic_pointer_cast<CancellationHandler>(shared_from_this()));
+#else
     out->cancelable(this);
-
+#endif
     Int requestId = 0;
     if(response)
     {
@@ -799,6 +813,81 @@ Ice::ConnectionI::flushBatchRequests()
     out.invoke();
 }
 
+#ifdef ICE_CPP11_MAPPING
+function<void ()>
+Ice::ConnectionI::flushBatchRequests_async(function<void ()>, function<void (exception_ptr)> exception,
+                                           function<void (bool)> sent) 
+{
+    class FlushBatchRequestsCallback : public CallbackBase
+    {
+    public:
+        
+        FlushBatchRequestsCallback(function<void (exception_ptr)> exception,
+                                   function<void (bool)> sent, 
+                                   shared_ptr<Connection> connection) :
+            _exception(move(exception)),
+            _sent(move(sent)),
+            _connection(move(connection))
+        {
+        }
+        
+        virtual void sent(const AsyncResultPtr& result) const
+        {
+            try
+            {
+                AsyncResult::__check(result, _connection.get(), __flushBatchRequests_name);
+                result->__wait();
+            }
+            catch(const ::Ice::Exception&)
+            {
+                _exception(current_exception());
+            }
+            
+            if(_sent)
+            {
+                _sent(result->sentSynchronously());
+            }
+        }
+        
+        virtual bool hasSentCallback() const
+        {
+            return true;
+        }
+
+        
+        virtual void
+        completed(const ::Ice::AsyncResultPtr& result) const
+        {
+            try
+            {
+                AsyncResult::__check(result, _connection.get(), __flushBatchRequests_name);
+                result->__wait();
+            }
+            catch(const ::Ice::Exception&)
+            {
+                _exception(current_exception());
+            }
+        }
+
+    private:
+
+        function<void (exception_ptr)> _exception;
+        function<void (bool)> _sent;
+        shared_ptr<Connection> _connection;
+    };
+    
+    auto self = dynamic_pointer_cast<ConnectionI>(shared_from_this());
+    
+    auto result = make_shared<ConnectionFlushBatchAsync>(self, _communicator, _instance, __flushBatchRequests_name,
+        make_shared<FlushBatchRequestsCallback>(move(exception), move(sent), self));
+    result->invoke();
+    return [result]()
+        {
+            result->cancel();
+        };
+}
+#else
+
 AsyncResultPtr
 Ice::ConnectionI::begin_flushBatchRequests()
 {
@@ -822,7 +911,7 @@ AsyncResultPtr
 Ice::ConnectionI::begin_flushBatchRequests(const IceInternal::Function<void (const Exception&)>& exception,
                                            const IceInternal::Function<void (bool)>& sent)
 {
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     class Cpp11CB : public IceInternal::Cpp11FnCallbackNC
     {
     public:
@@ -851,7 +940,7 @@ Ice::ConnectionI::begin_flushBatchRequests(const IceInternal::Function<void (con
         }
     };
 
-    return __begin_flushBatchRequests(new Cpp11CB(exception, sent), 0);
+    return __begin_flushBatchRequests(ICE_MAKE_SHARED(Cpp11CB, exception, sent), 0);
 #else
     assert(false); // Ice not built with C++11 support.
     return 0;
@@ -861,12 +950,17 @@ Ice::ConnectionI::begin_flushBatchRequests(const IceInternal::Function<void (con
 AsyncResultPtr
 Ice::ConnectionI::__begin_flushBatchRequests(const CallbackBasePtr& cb, const LocalObjectPtr& cookie)
 {
-    ConnectionFlushBatchAsyncPtr result = new ConnectionFlushBatchAsync(this,
-                                                                        _communicator,
-                                                                        _instance,
-                                                                        __flushBatchRequests_name,
-                                                                        cb,
-                                                                        cookie);
+    ConnectionFlushBatchAsyncPtr result = new ConnectionFlushBatchAsync(
+#ifdef ICE_CPP11_MAPPING
+        dynamic_pointer_cast<EventHandler>(shared_from_this()),
+#else
+        this,
+#endif
+        _communicator,
+        _instance,
+        __flushBatchRequests_name,
+        cb,
+        cookie);
     result->invoke();
     return result;
 }
@@ -877,6 +971,7 @@ Ice::ConnectionI::end_flushBatchRequests(const AsyncResultPtr& r)
     AsyncResult::__check(r, this, __flushBatchRequests_name);
     r->__wait();
 }
+#endif
 
 void
 Ice::ConnectionI::setCallback(const ConnectionCallbackPtr& callback)
@@ -907,7 +1002,11 @@ Ice::ConnectionI::setCallback(const ConnectionCallbackPtr& callback)
                     const ConnectionIPtr _connection;
                     const ConnectionCallbackPtr _callback;
                 };
+#ifdef ICE_CPP11_MAPPING
+                _threadPool->dispatch(new CallbackWorkItem(dynamic_pointer_cast<ConnectionI>(shared_from_this()), callback));
+#else
                 _threadPool->dispatch(new CallbackWorkItem(this, callback));
+#endif
             }
         }
         else
@@ -922,7 +1021,11 @@ Ice::ConnectionI::closeCallback(const ConnectionCallbackPtr& callback)
 {
     try
     {
+#ifdef ICE_CPP11_MAPPING
+        callback->closed(dynamic_pointer_cast<ConnectionI>(shared_from_this()));
+#else
         callback->closed(this);
+#endif
     }
     catch(const std::exception& ex)
     {
@@ -949,7 +1052,11 @@ Ice::ConnectionI::setACM(const IceUtil::Optional<int>& timeout,
 
     if(_state == StateActive)
     {
+#ifdef ICE_CPP11_MAPPING
+        _monitor->remove(dynamic_pointer_cast<ConnectionI>(shared_from_this()));
+#else
         _monitor->remove(this);
+#endif
     }
     _monitor = _monitor->acm(timeout, close, heartbeat);
 
@@ -964,7 +1071,11 @@ Ice::ConnectionI::setACM(const IceUtil::Optional<int>& timeout,
 
     if(_state == StateActive)
     {
+#ifdef ICE_CPP11_MAPPING
+        _monitor->add(dynamic_pointer_cast<ConnectionI>(shared_from_this()));
+#else
         _monitor->add(this);
+#endif
     }
 }
 
@@ -1089,7 +1200,7 @@ Ice::ConnectionI::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, con
             if(o->requestId)
             {
                 if(_asyncRequestsHint != _asyncRequests.end() &&
-                   _asyncRequestsHint->second == OutgoingAsyncPtr::dynamicCast(outAsync))
+                   _asyncRequestsHint->second == ICE_DYNAMIC_CAST(OutgoingAsync, outAsync))
                 {
                     _asyncRequests.erase(_asyncRequestsHint);
                     _asyncRequestsHint = _asyncRequests.end();
@@ -1128,7 +1239,7 @@ Ice::ConnectionI::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, con
         }
     }
 
-    if(OutgoingAsyncPtr::dynamicCast(outAsync))
+    if(ICE_DYNAMIC_CAST(OutgoingAsync, outAsync))
     {
         if(_asyncRequestsHint != _asyncRequests.end())
         {
@@ -1335,14 +1446,19 @@ Ice::ConnectionI::getEndpoint() const
     return _endpoint; // No mutex protection necessary, _endpoint is immutable.
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ConnectionI::createProxy(const Identity& ident) const
 {
     //
     // Create a reference and return a reverse proxy for this
     // reference.
     //
-    ConnectionIPtr self = const_cast<ConnectionI*>(this);
+    ConnectionIPtr self =
+#ifdef ICE_CPP11_MAPPING
+        dynamic_pointer_cast<ConnectionI>(const_pointer_cast<VirtualShared>(shared_from_this()));
+#else
+        const_cast<ConnectionI*>(this);
+#endif
     return _instance->proxyFactory()->referenceToProxy(_instance->referenceFactory()->create(ident, self));
 }
 
@@ -1461,7 +1577,6 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current)
     int dispatchCount = 0;
 
     ThreadPoolMessage<ConnectionI> msg(current, *this);
-
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
 
@@ -1593,7 +1708,12 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current)
                     // satisfied before continuing.
                     //
                     scheduleTimeout(newOp);
+#ifdef ICE_CPP11_MAPPING
+                    _threadPool->update(dynamic_pointer_cast<EventHandler>(shared_from_this()),
+                                        current.operation, newOp);
+#else
                     _threadPool->update(this, current.operation, newOp);
+#endif
                     return;
                 }
 
@@ -1607,7 +1727,12 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current)
                     return;
                 }
 
+#ifdef ICE_CPP11_MAPPING
+                _threadPool->unregister(dynamic_pointer_cast<EventHandler>(shared_from_this()),
+                                        current.operation);
+#else
                 _threadPool->unregister(this, current.operation);
+#endif
 
                 //
                 // We start out in holding state.
@@ -1655,7 +1780,12 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current)
                 if(_state < StateClosed)
                 {
                     scheduleTimeout(newOp);
+#ifdef ICE_CPP11_MAPPING
+                    _threadPool->update(dynamic_pointer_cast<EventHandler>(shared_from_this()), current.operation,
+                                        newOp);
+#else
                     _threadPool->update(this, current.operation, newOp);
+#endif
                 }
             }
 
@@ -1717,9 +1847,15 @@ Ice::ConnectionI::message(ThreadPoolCurrent& current)
     }
     else
     {
-        _threadPool->dispatchFromThisThread(new DispatchCall(this, startCB, sentCBs, compress, requestId, invokeNum,
-                                                             servantManager, adapter, outAsync, heartbeatCallback,
-                                                             current.stream));
+#ifdef ICE_CPP11_MAPPING
+        _threadPool->dispatchFromThisThread(new DispatchCall(dynamic_pointer_cast<ConnectionI>(shared_from_this()),
+            startCB, sentCBs, compress, requestId, invokeNum, servantManager, adapter, outAsync, heartbeatCallback,
+            current.stream));
+#else
+        _threadPool->dispatchFromThisThread(new DispatchCall(this, startCB, sentCBs, compress, requestId,
+            invokeNum, servantManager, adapter, outAsync, heartbeatCallback, current.stream));
+#endif
+
     }
 }
 
@@ -1737,7 +1873,12 @@ ConnectionI::dispatch(const StartCallbackPtr& startCB, const vector<OutgoingMess
     //
     if(startCB)
     {
+
+#ifdef ICE_CPP11_MAPPING
+        startCB->connectionStartCompleted(dynamic_pointer_cast<ConnectionI>(shared_from_this()));
+#else
         startCB->connectionStartCompleted(this);
+#endif
         ++dispatchedCount;
     }
 
@@ -1755,7 +1896,7 @@ ConnectionI::dispatch(const StartCallbackPtr& startCB, const vector<OutgoingMess
             }
             if(p->receivedReply)
             {
-                OutgoingAsyncPtr outAsync = OutgoingAsyncPtr::dynamicCast(p->outAsync);
+                OutgoingAsyncPtr outAsync = ICE_DYNAMIC_CAST(OutgoingAsync, p->outAsync);
                 if(outAsync->completed())
                 {
                     outAsync->invokeCompleted();
@@ -1782,7 +1923,11 @@ ConnectionI::dispatch(const StartCallbackPtr& startCB, const vector<OutgoingMess
     {
         try
         {
+#ifdef ICE_CPP11_MAPPING
+            heartbeatCallback->heartbeat(dynamic_pointer_cast<ConnectionI>(shared_from_this()));
+#else
             heartbeatCallback->heartbeat(this);
+#endif
         }
         catch(const std::exception& ex)
         {
@@ -1874,7 +2019,12 @@ Ice::ConnectionI::finished(ThreadPoolCurrent& current, bool close)
     }
     else
     {
+#ifdef ICE_CPP11_MAPPING
+        _threadPool->dispatchFromThisThread(new FinishCall(
+            dynamic_pointer_cast<ConnectionI>(shared_from_this()), close));
+#else
         _threadPool->dispatchFromThisThread(new FinishCall(this, close));
+#endif
     }
 }
 
@@ -1919,7 +2069,12 @@ Ice::ConnectionI::finish(bool close)
 
     if(_startCallback)
     {
+#ifdef ICE_CPP11_MAPPING
+        _startCallback->connectionStartFailed(
+            dynamic_pointer_cast<ConnectionI>(shared_from_this()), *_exception.get());
+#else
         _startCallback->connectionStartFailed(this, *_exception.get());
+#endif
         _startCallback = 0;
     }
 
@@ -1948,7 +2103,7 @@ Ice::ConnectionI::finish(bool close)
                 }
                 if(message->receivedReply)
                 {
-                    OutgoingAsyncPtr outAsync = OutgoingAsyncPtr::dynamicCast(message->outAsync);
+                    OutgoingAsyncPtr outAsync = ICE_DYNAMIC_CAST(OutgoingAsync, message->outAsync);
                     if(outAsync->completed())
                     {
                         outAsync->invokeCompleted();
@@ -2156,26 +2311,29 @@ Ice::ConnectionI::ConnectionI(const CommunicatorPtr& communicator,
     {
         _acmLastActivity = IceUtil::Time::now(IceUtil::Time::Monotonic);
     }
+}
 
-    __setNoDelete(true);
-    try
+Ice::ConnectionIPtr
+Ice::ConnectionI::create(const CommunicatorPtr& communicator,
+                         const InstancePtr& instance,
+                         const ACMMonitorPtr& monitor,
+                         const TransceiverPtr& transceiver,
+                         const ConnectorPtr& connector,
+                         const EndpointIPtr& endpoint,
+                         const ObjectAdapterIPtr& adapter)
+{
+    Ice::ConnectionIPtr conn(new ConnectionI(communicator, instance, monitor, transceiver, connector,
+                                             endpoint, adapter));
+    if(adapter)
     {
-        if(adapter)
-        {
-            const_cast<ThreadPoolPtr&>(_threadPool) = adapter->getThreadPool();
-        }
-        else
-        {
-            const_cast<ThreadPoolPtr&>(_threadPool) = _instance->clientThreadPool();
-        }
-        _threadPool->initialize(this);
+        const_cast<ThreadPoolPtr&>(conn->_threadPool) = adapter->getThreadPool();
     }
-    catch(const IceUtil::Exception&)
+    else
     {
-        __setNoDelete(false);
-        throw;
+        const_cast<ThreadPoolPtr&>(conn->_threadPool) = conn->_instance->clientThreadPool();
     }
-    __setNoDelete(false);
+    conn->_threadPool->initialize(conn);
+    return conn;
 }
 
 Ice::ConnectionI::~ConnectionI()
@@ -2296,7 +2454,12 @@ Ice::ConnectionI::setState(State state)
             {
                 return;
             }
+#ifdef ICE_CPP11_MAPPING
+            _threadPool->_register(dynamic_pointer_cast<EventHandler>(shared_from_this()),
+                                   SocketOperationRead);
+#else
             _threadPool->_register(this, SocketOperationRead);
+#endif
             break;
         }
 
@@ -2312,7 +2475,12 @@ Ice::ConnectionI::setState(State state)
             }
             if(_state == StateActive)
             {
+#ifdef ICE_CPP11_MAPPING
+                _threadPool->unregister(dynamic_pointer_cast<EventHandler>(shared_from_this()),
+                                        SocketOperationRead);
+#else
                 _threadPool->unregister(this, SocketOperationRead);
+#endif
             }
             break;
         }
@@ -2343,7 +2511,11 @@ Ice::ConnectionI::setState(State state)
             // Don't need to close now for connections so only close the transceiver
             // if the selector request it.
             //
+#ifdef ICE_CPP11_MAPPING
+            if(_threadPool->finish(dynamic_pointer_cast<EventHandler>(shared_from_this()), false))
+#else
             if(_threadPool->finish(this, false))
+#endif
             {
                 _transceiver->close();
             }
@@ -2378,11 +2550,19 @@ Ice::ConnectionI::setState(State state)
             {
                 _acmLastActivity = IceUtil::Time::now(IceUtil::Time::Monotonic);
             }
+#ifdef ICE_CPP11_MAPPING
+            _monitor->add(dynamic_pointer_cast<ConnectionI>(shared_from_this()));
+#else
             _monitor->add(this);
+#endif
         }
         else if(_state == StateActive)
         {
+#ifdef ICE_CPP11_MAPPING
+            _monitor->remove(dynamic_pointer_cast<ConnectionI>(shared_from_this()));
+#else
             _monitor->remove(this);
+#endif
         }
     }
 
@@ -2467,7 +2647,11 @@ Ice::ConnectionI::initiateShutdown()
             if(op)
             {
                 scheduleTimeout(op);
+#ifdef ICE_CPP11_MAPPING
+                _threadPool->_register(dynamic_pointer_cast<EventHandler>(shared_from_this()), op);
+#else
                 _threadPool->_register(this, op);
+#endif
             }
         }
     }
@@ -2511,7 +2695,11 @@ Ice::ConnectionI::initialize(SocketOperation operation)
     if(s != SocketOperationNone)
     {
         scheduleTimeout(s);
+#ifdef ICE_CPP11_MAPPING
+        _threadPool->update(dynamic_pointer_cast<EventHandler>(shared_from_this()), operation, s);
+#else
         _threadPool->update(this, operation, s);
+#endif
         return false;
     }
 
@@ -2557,7 +2745,11 @@ Ice::ConnectionI::validate(SocketOperation operation)
                 if(op)
                 {
                     scheduleTimeout(op);
+#ifdef ICE_CPP11_MAPPING
+                    _threadPool->update(dynamic_pointer_cast<EventHandler>(shared_from_this()), operation, op);
+#else
                     _threadPool->update(this, operation, op);
+#endif
                     return false;
                 }
             }
@@ -2586,7 +2778,11 @@ Ice::ConnectionI::validate(SocketOperation operation)
                 if(op)
                 {
                     scheduleTimeout(op);
+#ifdef ICE_CPP11_MAPPING
+                    _threadPool->update(dynamic_pointer_cast<EventHandler>(shared_from_this()), operation, op);
+#else
                     _threadPool->update(this, operation, op);
+#endif
                     return false;
                 }
             }
@@ -2964,7 +3160,11 @@ Ice::ConnectionI::sendMessage(OutgoingMessage& message)
 
     _writeStream.swap(*_sendStreams.back().stream);
     scheduleTimeout(op);
+#ifdef ICE_CPP11_MAPPING
+    _threadPool->_register(dynamic_pointer_cast<EventHandler>(shared_from_this()), op);
+#else
     _threadPool->_register(this, op);
+#endif
     return AsyncStatusQueued;
 }
 
@@ -3520,7 +3720,7 @@ Ice::ConnectionI::initConnectionInfo() const
     }
     catch(const Ice::LocalException&)
     {
-        _info = new ConnectionInfo();
+        _info = ICE_MAKE_SHARED(ConnectionInfo);
     }
     _info->connectionId = _endpoint->connectionId();
     _info->incoming = _connector == 0;
@@ -3579,7 +3779,11 @@ ConnectionI::reap()
 {
     if(_monitor)
     {
+#ifdef ICE_CPP11_MAPPING
+        _monitor->reap(dynamic_pointer_cast<ConnectionI>(shared_from_this()));
+#else
         _monitor->reap(this);
+#endif
     }
     if(_observer)
     {
diff --git a/cpp/src/Ice/ConnectionI.h b/cpp/src/Ice/ConnectionI.h
index fdb80901122..c3b4c270311 100644
--- a/cpp/src/Ice/ConnectionI.h
+++ b/cpp/src/Ice/ConnectionI.h
@@ -60,7 +60,7 @@ namespace Ice
 
 class LocalException;
 class ObjectAdapterI;
-typedef IceUtil::Handle<ObjectAdapterI> ObjectAdapterIPtr;
+ICE_DEFINE_PTR(ObjectAdapterIPtr, ObjectAdapterI);
 
 class ConnectionI : public Connection,
                     public IceInternal::EventHandler,
@@ -134,6 +134,17 @@ public:
 #endif
     };
 
+    
+#ifdef ICE_CPP11_MAPPING
+    class StartCallback
+    {
+    public:
+
+        virtual void connectionStartCompleted(const ConnectionIPtr&) = 0;
+        virtual void connectionStartFailed(const ConnectionIPtr&, const Ice::LocalException&) = 0;
+    };
+    typedef ::std::shared_ptr<StartCallback> StartCallbackPtr;
+#else
     class StartCallback : virtual public IceUtil::Shared
     {
     public:
@@ -142,7 +153,8 @@ public:
         virtual void connectionStartFailed(const ConnectionIPtr&, const Ice::LocalException&) = 0;
     };
     typedef IceUtil::Handle<StartCallback> StartCallbackPtr;
-
+#endif
+    
     enum DestructionReason
     {
         ObjectAdapterDeactivated,
@@ -174,16 +186,22 @@ public:
 
     virtual void flushBatchRequests(); // From Connection.
 
+#ifdef ICE_CPP11_MAPPING
+    virtual std::function<void ()>
+    flushBatchRequests_async(::std::function<void ()> completed,
+                             ::std::function<void (::std::exception_ptr)> exception = nullptr,
+                             ::std::function<void (bool)> sent = nullptr);
+#else
     virtual AsyncResultPtr begin_flushBatchRequests();
     virtual AsyncResultPtr begin_flushBatchRequests(const CallbackPtr&, const LocalObjectPtr& = 0);
     virtual AsyncResultPtr begin_flushBatchRequests(const Callback_Connection_flushBatchRequestsPtr&,
                                                     const LocalObjectPtr& = 0);
-
     virtual AsyncResultPtr begin_flushBatchRequests(
         const ::IceInternal::Function<void (const ::Ice::Exception&)>&,
         const ::IceInternal::Function<void (bool)>& = ::IceInternal::Function<void (bool)>());
 
     virtual void end_flushBatchRequests(const AsyncResultPtr&);
+#endif
 
     virtual void setCallback(const ConnectionCallbackPtr&);
     virtual void setACM(const IceUtil::Optional<int>&,
@@ -205,7 +223,7 @@ public:
     virtual void setAdapter(const ObjectAdapterPtr&); // From Connection.
     virtual ObjectAdapterPtr getAdapter() const; // From Connection.
     virtual EndpointPtr getEndpoint() const; // From Connection.
-    virtual ObjectPrx createProxy(const Identity& ident) const; // From Connection.
+    virtual ObjectPrxPtr createProxy(const Identity& ident) const; // From Connection.
 
     //
     // Operations from EventHandler
@@ -238,8 +256,20 @@ public:
 
     void closeCallback(const ConnectionCallbackPtr&);
 
+
+    virtual ~ConnectionI();
+
 private:
 
+    ConnectionI(const Ice::CommunicatorPtr&, const IceInternal::InstancePtr&, const IceInternal::ACMMonitorPtr&,
+                const IceInternal::TransceiverPtr&, const IceInternal::ConnectorPtr&,
+                const IceInternal::EndpointIPtr&, const ObjectAdapterIPtr&);
+
+    static ConnectionIPtr
+    create(const Ice::CommunicatorPtr&, const IceInternal::InstancePtr&, const IceInternal::ACMMonitorPtr&,
+           const IceInternal::TransceiverPtr&, const IceInternal::ConnectorPtr&,
+           const IceInternal::EndpointIPtr&, const ObjectAdapterIPtr&);
+
     enum State
     {
         StateNotInitialized,
@@ -252,11 +282,6 @@ private:
         StateFinished
     };
 
-    ConnectionI(const Ice::CommunicatorPtr&, const IceInternal::InstancePtr&, const IceInternal::ACMMonitorPtr&,
-                const IceInternal::TransceiverPtr&, const IceInternal::ConnectorPtr&,
-                const IceInternal::EndpointIPtr&, const ObjectAdapterIPtr&);
-    virtual ~ConnectionI();
-
     friend class IceInternal::IncomingConnectionFactory;
     friend class IceInternal::OutgoingConnectionFactory;
 
diff --git a/cpp/src/Ice/ConnectionRequestHandler.cpp b/cpp/src/Ice/ConnectionRequestHandler.cpp
index cab544915e6..62bcebb111c 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.cpp
+++ b/cpp/src/Ice/ConnectionRequestHandler.cpp
@@ -51,7 +51,7 @@ ConnectionRequestHandler::update(const RequestHandlerPtr& previousHandler, const
     {
         // Ignore.
     }
-    return this;
+    return ICE_SHARED_FROM_THIS;
 }
 
 bool
diff --git a/cpp/src/Ice/ConnectionRequestHandler.h b/cpp/src/Ice/ConnectionRequestHandler.h
index cef3df68f4d..29f70063768 100644
--- a/cpp/src/Ice/ConnectionRequestHandler.h
+++ b/cpp/src/Ice/ConnectionRequestHandler.h
@@ -17,7 +17,8 @@
 namespace IceInternal
 {
 
-class ConnectionRequestHandler : public RequestHandler
+class ConnectionRequestHandler : public RequestHandler,
+                                 public ICE_ENABLE_SHARED_FROM_THIS(ConnectionRequestHandler)
 {
 public:
 
diff --git a/cpp/src/Ice/DynamicLibrary.cpp b/cpp/src/Ice/DynamicLibrary.cpp
index aaf5a101e67..fc13d9188d7 100644
--- a/cpp/src/Ice/DynamicLibrary.cpp
+++ b/cpp/src/Ice/DynamicLibrary.cpp
@@ -89,7 +89,7 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
     if(comma == string::npos)
     {
         libName = libSpec;
-#  if defined(ICE_CPP11) && defined(__GLIBCXX__)
+#  if defined(ICE_CPP11_COMPILER) && defined(__GLIBCXX__)
         libName += "++11";
 #  endif
         if(useIceVersion)
@@ -119,7 +119,7 @@ IceInternal::DynamicLibrary::loadEntryPoint(const string& entryPoint, bool useIc
             return 0;
         }
         libName = libSpec.substr(0, comma);
-#  if defined(ICE_CPP11) && defined(__GLIBCXX__)
+#  if defined(ICE_CPP11_COMPILER) && defined(__GLIBCXX__)
         libName += "++11";
 #  endif
         version = libSpec.substr(comma + 1);
diff --git a/cpp/src/Ice/EndpointFactoryManager.cpp b/cpp/src/Ice/EndpointFactoryManager.cpp
index 25487819338..6830eda8521 100644
--- a/cpp/src/Ice/EndpointFactoryManager.cpp
+++ b/cpp/src/Ice/EndpointFactoryManager.cpp
@@ -140,7 +140,7 @@ IceInternal::EndpointFactoryManager::create(const string& str, bool oaEndpoint)
     //
     if(protocol == "opaque")
     {
-        EndpointIPtr ue = new OpaqueEndpointI(v);
+        EndpointIPtr ue = ICE_MAKE_SHARED(OpaqueEndpointI, v);
         if(!v.empty())
         {
             EndpointParseException ex(__FILE__, __LINE__);
@@ -189,7 +189,7 @@ IceInternal::EndpointFactoryManager::read(BasicStream* s) const
     }
     else
     {
-        e = new OpaqueEndpointI(type, s);
+        e = ICE_MAKE_SHARED(OpaqueEndpointI, type, s);
     }
 
     s->endReadEncaps();
diff --git a/cpp/src/Ice/EndpointI.cpp b/cpp/src/Ice/EndpointI.cpp
index bb967ab0e26..073b9049549 100644
--- a/cpp/src/Ice/EndpointI.cpp
+++ b/cpp/src/Ice/EndpointI.cpp
@@ -11,8 +11,10 @@
 
 using namespace std;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(EndpointI* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(EndpointI_connectors* p) { return p; }
+#endif
 
 string
 IceInternal::EndpointI::toString() const
diff --git a/cpp/src/Ice/EndpointI.h b/cpp/src/Ice/EndpointI.h
index df41372bd82..6000f706bdb 100644
--- a/cpp/src/Ice/EndpointI.h
+++ b/cpp/src/Ice/EndpointI.h
@@ -22,7 +22,10 @@ namespace IceInternal
 
 class BasicStream;
 
-class ICE_API EndpointI_connectors : public virtual IceUtil::Shared
+class ICE_API EndpointI_connectors 
+#ifndef ICE_CPP11_MAPPING
+    : public virtual IceUtil::Shared
+#endif
 {
 public:
 
@@ -32,7 +35,8 @@ public:
     virtual void exception(const Ice::LocalException&) = 0;
 };
 
-class ICE_API EndpointI : public Ice::Endpoint
+class ICE_API EndpointI : public Ice::Endpoint,
+                          public ICE_ENABLE_SHARED_FROM_THIS(EndpointI)
 {
 public:
 
@@ -131,8 +135,13 @@ public:
     //
     // Compare endpoints for sorting purposes.
     //
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const EndpointI&) const = 0;
+    virtual bool operator<(const EndpointI&) const = 0;
+#else
     virtual bool operator==(const Ice::LocalObject&) const = 0;
     virtual bool operator<(const Ice::LocalObject&) const = 0;
+#endif
 
     virtual ::Ice::Int hash() const = 0;
 
@@ -150,6 +159,7 @@ protected:
 
 };
 
+#ifndef ICE_CPP11_MAPPING
 inline bool operator==(const EndpointI& l, const EndpointI& r)
 {
     return static_cast<const ::Ice::LocalObject&>(l) == static_cast<const ::Ice::LocalObject&>(r);
@@ -159,6 +169,7 @@ inline bool operator<(const EndpointI& l, const EndpointI& r)
 {
     return static_cast<const ::Ice::LocalObject&>(l) < static_cast<const ::Ice::LocalObject&>(r);
 }
+#endif
 
 template<typename T> class InfoI : public T
 {
diff --git a/cpp/src/Ice/EndpointIF.h b/cpp/src/Ice/EndpointIF.h
index b851a8871b9..47959d98c28 100644
--- a/cpp/src/Ice/EndpointIF.h
+++ b/cpp/src/Ice/EndpointIF.h
@@ -17,25 +17,38 @@ namespace IceInternal
 {
 
 class EndpointI;
+class TcpEndpointI;
+class UdpEndpointI;
+class WSEndpoint;
+class EndpointI_connectors;
+
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+typedef ::std::shared_ptr<EndpointI> EndpointIPtr;
+typedef ::std::shared_ptr<TcpEndpointI> TcpEndpointIPtr;
+typedef ::std::shared_ptr<UdpEndpointI> UdpEndpointIPtr;
+typedef ::std::shared_ptr<WSEndpoint> WSEndpointPtr;
+typedef ::std::shared_ptr<EndpointI_connectors> EndpointI_connectorsPtr;
+
+#else // C++98 mapping
+
 ICE_API IceUtil::Shared* upCast(EndpointI*);
 typedef Handle<EndpointI> EndpointIPtr;
 
-class TcpEndpointI;
 ICE_API IceUtil::Shared* upCast(TcpEndpointI*);
 typedef Handle<TcpEndpointI> TcpEndpointIPtr;
 
-class UdpEndpointI;
 ICE_API IceUtil::Shared* upCast(UdpEndpointI*);
 typedef Handle<UdpEndpointI> UdpEndpointIPtr;
 
-class WSEndpoint;
 ICE_API IceUtil::Shared* upCast(WSEndpoint*);
 typedef Handle<WSEndpoint> WSEndpointPtr;
 
-class EndpointI_connectors;
 ICE_API IceUtil::Shared* upCast(EndpointI_connectors*);
 typedef Handle<EndpointI_connectors> EndpointI_connectorsPtr;
 
+#endif
+
 }
 
 #endif
diff --git a/cpp/src/Ice/EventHandler.cpp b/cpp/src/Ice/EventHandler.cpp
index 6edea2d9307..ffa7f218c92 100644
--- a/cpp/src/Ice/EventHandler.cpp
+++ b/cpp/src/Ice/EventHandler.cpp
@@ -14,7 +14,9 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(EventHandler* p) { return p; }
+#endif
 
 IceInternal::EventHandler::EventHandler() :
 #if defined(ICE_USE_IOCP) || defined(ICE_OS_WINRT)
diff --git a/cpp/src/Ice/EventHandler.h b/cpp/src/Ice/EventHandler.h
index a47a1899d10..47e4473ca1b 100644
--- a/cpp/src/Ice/EventHandler.h
+++ b/cpp/src/Ice/EventHandler.h
@@ -16,11 +16,17 @@
 #include <Ice/ThreadPoolF.h>
 #include <Ice/BasicStream.h>
 #include <Ice/Network.h>
+#include <Ice/VirtualShared.h>
 
 namespace IceInternal
 {
 
-class ICE_API EventHandler : virtual public ::Ice::LocalObject
+class ICE_API EventHandler :
+#ifdef ICE_CPP11_MAPPING
+    virtual public VirtualShared
+#else
+    virtual public ::Ice::LocalObject
+#endif
 {
 public:
 
diff --git a/cpp/src/Ice/EventHandlerF.h b/cpp/src/Ice/EventHandlerF.h
index e627e964c4d..878651e40db 100644
--- a/cpp/src/Ice/EventHandlerF.h
+++ b/cpp/src/Ice/EventHandlerF.h
@@ -18,9 +18,12 @@ namespace IceInternal
 {
 
 class EventHandler;
+#ifdef ICE_CPP11_MAPPING
+typedef ::std::shared_ptr<EventHandler> EventHandlerPtr;
+#else
 ICE_API IceUtil::Shared* upCast(EventHandler*);
 typedef Handle<EventHandler> EventHandlerPtr;
-
+#endif
 }
 
 #endif
diff --git a/cpp/src/Ice/Exception.cpp b/cpp/src/Ice/Exception.cpp
index 7efe9309ee9..d23255ef4ab 100644
--- a/cpp/src/Ice/Exception.cpp
+++ b/cpp/src/Ice/Exception.cpp
@@ -66,7 +66,7 @@ namespace Ex
 {
 
 void
-throwUOE(const string& expectedType, const ObjectPtr& v)
+throwUOE(const string& expectedType, const ValuePtr& v)
 {
     //
     // If the object is an unknown sliced object, we didn't find an
diff --git a/cpp/src/Ice/FactoryTable.cpp b/cpp/src/Ice/FactoryTable.cpp
index aae6142bb3d..bc48ab8d6e9 100644
--- a/cpp/src/Ice/FactoryTable.cpp
+++ b/cpp/src/Ice/FactoryTable.cpp
@@ -10,12 +10,14 @@
 #include <Ice/FactoryTable.h>
 #include <Ice/ObjectFactory.h>
 
+using namespace std;
+
 //
 // Add a factory to the exception factory table.
 // If the factory is present already, increment its reference count.
 //
 void
-IceInternal::FactoryTable::addExceptionFactory(const std::string& t, const IceInternal::UserExceptionFactoryPtr& f)
+IceInternal::FactoryTable::addExceptionFactory(const string& t, const IceInternal::UserExceptionFactoryPtr& f)
 {
     IceUtil::Mutex::Lock lock(_m);
     assert(f);
@@ -34,7 +36,7 @@ IceInternal::FactoryTable::addExceptionFactory(const std::string& t, const IceIn
 // Return the exception factory for a given type ID
 //
 IceInternal::UserExceptionFactoryPtr
-IceInternal::FactoryTable::getExceptionFactory(const std::string& t) const
+IceInternal::FactoryTable::getExceptionFactory(const string& t) const
 {
     IceUtil::Mutex::Lock lock(_m);
     EFTable::const_iterator i = _eft.find(t);
@@ -48,7 +50,7 @@ IceInternal::FactoryTable::getExceptionFactory(const std::string& t) const
 // entry from the table.
 //
 void
-IceInternal::FactoryTable::removeExceptionFactory(const std::string& t)
+IceInternal::FactoryTable::removeExceptionFactory(const string& t)
 {
     IceUtil::Mutex::Lock lock(_m);
     EFTable::iterator i = _eft.find(t);
@@ -64,8 +66,13 @@ IceInternal::FactoryTable::removeExceptionFactory(const std::string& t)
 //
 // Add a factory to the object factory table.
 //
+#ifdef ICE_CPP11_MAPPING
+void
+IceInternal::FactoryTable::addObjectFactory(const string& t, function<::Ice::ValuePtr (const string&)> f)
+#else
 void
-IceInternal::FactoryTable::addObjectFactory(const std::string& t, const Ice::ObjectFactoryPtr& f)
+IceInternal::FactoryTable::addObjectFactory(const string& t, const ::Ice::ObjectFactoryPtr& f)
+#endif
 {
     IceUtil::Mutex::Lock lock(_m);
     assert(f);
@@ -83,13 +90,23 @@ IceInternal::FactoryTable::addObjectFactory(const std::string& t, const Ice::Obj
 //
 // Return the object factory for a given type ID
 //
+#ifdef ICE_CPP11_MAPPING
+function<Ice::ValuePtr(const string&)>
+IceInternal::FactoryTable::getObjectFactory(const string& t) const
+{
+    IceUtil::Mutex::Lock lock(_m);
+    OFTable::const_iterator i = _oft.find(t);
+    return i != _oft.end() ? i->second.first : nullptr;
+}
+#else
 Ice::ObjectFactoryPtr
-IceInternal::FactoryTable::getObjectFactory(const std::string& t) const
+IceInternal::FactoryTable::getObjectFactory(const string& t) const
 {
     IceUtil::Mutex::Lock lock(_m);
     OFTable::const_iterator i = _oft.find(t);
     return i != _oft.end() ? i->second.first : Ice::ObjectFactoryPtr();
 }
+#endif
 
 //
 // Remove a factory from the object factory table. If the factory
@@ -98,7 +115,7 @@ IceInternal::FactoryTable::getObjectFactory(const std::string& t) const
 // entry from the table.
 //
 void
-IceInternal::FactoryTable::removeObjectFactory(const std::string& t)
+IceInternal::FactoryTable::removeObjectFactory(const string& t)
 {
     IceUtil::Mutex::Lock lock(_m);
     OFTable::iterator i = _oft.find(t);
@@ -115,7 +132,7 @@ IceInternal::FactoryTable::removeObjectFactory(const std::string& t)
 // Add a factory to the object factory table.
 //
 void
-IceInternal::FactoryTable::addTypeId(int compactId, const std::string& typeId)
+IceInternal::FactoryTable::addTypeId(int compactId, const string& typeId)
 {
     IceUtil::Mutex::Lock lock(_m);
     assert(!typeId.empty() && compactId >= 0);
@@ -133,12 +150,12 @@ IceInternal::FactoryTable::addTypeId(int compactId, const std::string& typeId)
 //
 // Return the type ID for the given compact ID
 //
-std::string
+string
 IceInternal::FactoryTable::getTypeId(int compactId) const
 {
     IceUtil::Mutex::Lock lock(_m);
     TypeIdTable::const_iterator i = _typeIdTable.find(compactId);
-    return i != _typeIdTable.end() ? i->second.first : std::string();
+    return i != _typeIdTable.end() ? i->second.first : string();
 }
 
 void
diff --git a/cpp/src/Ice/GCObject.cpp b/cpp/src/Ice/GCObject.cpp
index 303116f8679..f5101ded9c9 100644
--- a/cpp/src/Ice/GCObject.cpp
+++ b/cpp/src/Ice/GCObject.cpp
@@ -9,6 +9,8 @@
 
 #include <Ice/GCObject.h>
 
+#ifndef ICE_CPP11_MAPPING
+
 #include <set>
 #include <stack>
 
@@ -442,3 +444,4 @@ GCObject::collect(IceUtilInternal::MutexPtrLock<IceUtil::Mutex>& lock)
     }
     return true;
 }
+#endif
diff --git a/cpp/src/Ice/IPEndpointI.cpp b/cpp/src/Ice/IPEndpointI.cpp
index 49c17dba4ad..74d274d8d77 100644
--- a/cpp/src/Ice/IPEndpointI.cpp
+++ b/cpp/src/Ice/IPEndpointI.cpp
@@ -46,7 +46,9 @@ Init init;
 
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(IPEndpointI* p) { return p; }
+#endif
 IceUtil::Shared* IceInternal::upCast(EndpointHostResolver* p) { return p; }
 
 IceInternal::IPEndpointInfoI::IPEndpointInfoI(const EndpointIPtr& endpoint) : _endpoint(endpoint)
@@ -78,7 +80,13 @@ IceInternal::IPEndpointInfoI::secure() const
 Ice::EndpointInfoPtr
 IceInternal::IPEndpointI::getInfo() const
 {
-    Ice::IPEndpointInfoPtr info = new IPEndpointInfoI(const_cast<IPEndpointI*>(this));
+    Ice::IPEndpointInfoPtr info 
+#ifdef ICE_CPP11_MAPPING
+        = make_shared<IPEndpointInfoI>(
+            dynamic_pointer_cast<IPEndpointI>(const_pointer_cast<EndpointI>(shared_from_this())));
+#else
+        = new IPEndpointInfoI(const_cast<IPEndpointI*>(this));
+#endif
     fillEndpointInfo(info.get());
     return info;
 }
@@ -121,7 +129,12 @@ IceInternal::IPEndpointI::connectionId(const string& connectionId) const
 {
     if(connectionId == _connectionId)
     {
+#ifdef ICE_CPP11_MAPPING
+        return dynamic_pointer_cast<IPEndpointI>(
+            const_pointer_cast<EndpointI>(shared_from_this()));
+#else
         return const_cast<IPEndpointI*>(this);
+#endif
     }
     else
     {
@@ -144,7 +157,13 @@ IceInternal::IPEndpointI::port() const
 void
 IceInternal::IPEndpointI::connectors_async(Ice::EndpointSelectionType selType, const EndpointI_connectorsPtr& cb) const
 {
-    _instance->resolve(_host, _port, selType, const_cast<IPEndpointI*>(this), cb);
+    _instance->resolve(_host, _port, selType, 
+#ifdef ICE_CPP11_MAPPING
+                       dynamic_pointer_cast<IPEndpointI>(const_pointer_cast<EndpointI>(shared_from_this())),
+#else
+                       const_cast<IPEndpointI*>(this), 
+#endif
+                       cb);
 }
 
 vector<EndpointIPtr>
@@ -154,7 +173,13 @@ IceInternal::IPEndpointI::expand() const
     vector<string> hosts = getHostsForEndpointExpand(_host, _instance->protocolSupport(), false);
     if(hosts.empty())
     {
-        endps.push_back(const_cast<IPEndpointI*>(this));
+        endps.push_back(
+#ifdef ICE_CPP11_MAPPING
+                       dynamic_pointer_cast<IPEndpointI>(const_pointer_cast<EndpointI>(shared_from_this()))
+#else
+                       const_cast<IPEndpointI*>(this)
+#endif
+        );
     }
     else
     {
@@ -229,7 +254,11 @@ IceInternal::IPEndpointI::options() const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::IPEndpointI::operator==(const EndpointI& r) const
+#else
 IceInternal::IPEndpointI::operator==(const LocalObject& r) const
+#endif
 {
     const IPEndpointI* p = dynamic_cast<const IPEndpointI*>(&r);
     if(!p)
@@ -261,12 +290,15 @@ IceInternal::IPEndpointI::operator==(const LocalObject& r) const
     {
         return false;
     }
-
     return true;
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::IPEndpointI::operator<(const EndpointI& r) const
+#else
 IceInternal::IPEndpointI::operator<(const LocalObject& r) const
+#endif
 {
     const IPEndpointI* p = dynamic_cast<const IPEndpointI*>(&r);
     if(!p)
diff --git a/cpp/src/Ice/IPEndpointI.h b/cpp/src/Ice/IPEndpointI.h
index 91263da5f39..396d25fdad8 100644
--- a/cpp/src/Ice/IPEndpointI.h
+++ b/cpp/src/Ice/IPEndpointI.h
@@ -62,8 +62,13 @@ public:
     virtual ::Ice::Int hash() const;
     virtual std::string options() const;
 
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const EndpointI&) const;
+    virtual bool operator<(const EndpointI&) const;
+#else
     virtual bool operator==(const Ice::LocalObject&) const;
     virtual bool operator<(const Ice::LocalObject&) const;
+#endif
 
     virtual std::vector<ConnectorPtr> connectors(const std::vector<Address>&, const NetworkProxyPtr&) const;
     const std::string& host() const;
@@ -143,6 +148,7 @@ private:
 #endif
 };
 
+#ifndef ICE_CPP11_MAPPING
 inline bool operator==(const IPEndpointI& l, const IPEndpointI& r)
 {
     return static_cast<const ::Ice::LocalObject&>(l) == static_cast<const ::Ice::LocalObject&>(r);
@@ -152,6 +158,7 @@ inline bool operator<(const IPEndpointI& l, const IPEndpointI& r)
 {
     return static_cast<const ::Ice::LocalObject&>(l) < static_cast<const ::Ice::LocalObject&>(r);
 }
+#endif
 
 }
 
diff --git a/cpp/src/Ice/IPEndpointIF.h b/cpp/src/Ice/IPEndpointIF.h
index aec4433cfc5..a092235c26e 100644
--- a/cpp/src/Ice/IPEndpointIF.h
+++ b/cpp/src/Ice/IPEndpointIF.h
@@ -17,13 +17,17 @@ namespace IceInternal
 {
 
 class IPEndpointI;
+
+#ifdef ICE_CPP11_MAPPING
+typedef ::std::shared_ptr<IPEndpointI> IPEndpointIPtr;
+#else
 ICE_API IceUtil::Shared* upCast(IPEndpointI*);
 typedef Handle<IPEndpointI> IPEndpointIPtr;
+#endif
 
 class EndpointHostResolver;
 ICE_API IceUtil::Shared* upCast(EndpointHostResolver*);
 typedef Handle<EndpointHostResolver> EndpointHostResolverPtr;
-
 }
 
 #endif
diff --git a/cpp/src/Ice/ImplicitContextI.cpp b/cpp/src/Ice/ImplicitContextI.cpp
index 5af15c5eae3..a4d58f9e9b7 100644
--- a/cpp/src/Ice/ImplicitContextI.cpp
+++ b/cpp/src/Ice/ImplicitContextI.cpp
@@ -22,7 +22,7 @@ namespace
 class SharedImplicitContext : public ImplicitContextI
 {
 public:
-    
+
     virtual Context getContext() const;
     virtual void setContext(const Context&);
 
@@ -43,7 +43,7 @@ private:
 class PerThreadImplicitContext : public ImplicitContextI
 {
 public:
-    
+
     PerThreadImplicitContext();
     virtual ~PerThreadImplicitContext();
 
@@ -76,7 +76,7 @@ public:
     // is assigned a slot in this vector.
     //
     typedef std::vector<Slot> SlotVector;
-    
+
     //
     // We remember which slot-indices are in use (to be able to reuse indices)
     //
@@ -90,7 +90,7 @@ public:
     static DWORD _key;
 #else
     static pthread_key_t _key;
-#endif    
+#endif
 
 private:
 
@@ -107,7 +107,7 @@ extern "C" void iceImplicitContextThreadDestructor(void*);
 
 
 
-/*static*/ ImplicitContextI*
+ImplicitContextIPtr
 ImplicitContextI::create(const std::string& kind)
 {
     if(kind == "None" || kind == "")
@@ -116,14 +116,14 @@ ImplicitContextI::create(const std::string& kind)
     }
     else if(kind == "Shared")
     {
-        return new SharedImplicitContext;
+        return ICE_MAKE_SHARED(SharedImplicitContext);
     }
     else if(kind == "PerThread")
     {
 #ifndef ICE_OS_WINRT
-        return new PerThreadImplicitContext;
+        return ICE_MAKE_SHARED(PerThreadImplicitContext);
 #else
-        throw InitializationException(__FILE__, __LINE__, 
+        throw InitializationException(__FILE__, __LINE__,
                                       "'PerThread' Ice.ImplicitContext isn't supported for WinRT.");
         return 0; // Keep the compiler happy.
 #endif
@@ -132,7 +132,7 @@ ImplicitContextI::create(const std::string& kind)
     {
         throw Ice::InitializationException(
             __FILE__, __LINE__,
-            "'" + kind + "' is not a valid value for Ice.ImplicitContext"); 
+            "'" + kind + "' is not a valid value for Ice.ImplicitContext");
         return 0; // Keep the compiler happy.
     }
 }
@@ -144,7 +144,7 @@ ImplicitContextI::cleanupThread()
     if(PerThreadImplicitContext::_nextId > 0)
     {
         iceImplicitContextThreadDestructor(TlsGetValue(PerThreadImplicitContext::_key));
-    } 
+    }
 }
 #endif
 
@@ -167,7 +167,7 @@ SharedImplicitContext::setContext(const Context& newContext)
     _context = newContext;
 }
 
-bool 
+bool
 SharedImplicitContext::containsKey(const string& k) const
 {
     IceUtil::Mutex::Lock lock(_mutex);
@@ -175,7 +175,7 @@ SharedImplicitContext::containsKey(const string& k) const
     return p != _context.end();
 }
 
-string 
+string
 SharedImplicitContext::get(const string& k) const
 {
     IceUtil::Mutex::Lock lock(_mutex);
@@ -188,12 +188,12 @@ SharedImplicitContext::get(const string& k) const
 }
 
 
-string 
+string
 SharedImplicitContext::put(const string& k, const string& v)
 {
     IceUtil::Mutex::Lock lock(_mutex);
     string& val = _context[k];
-    
+
     string oldVal = val;
     val = v;
     return oldVal;
@@ -216,7 +216,7 @@ SharedImplicitContext::remove(const string& k)
     }
 }
 
-void 
+void
 SharedImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStream* s) const
 {
     IceUtil::Mutex::Lock lock(_mutex);
@@ -238,7 +238,7 @@ SharedImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStream
     }
 }
 
-void 
+void
 SharedImplicitContext::combine(const Context& proxyCtx, Context& ctx) const
 {
     IceUtil::Mutex::Lock lock(_mutex);
@@ -318,7 +318,7 @@ PerThreadImplicitContext::PerThreadImplicitContext()
         }
 #   endif
     }
-    
+
     //
     // Now grabs an index
     //
@@ -444,7 +444,7 @@ PerThreadImplicitContext::clearThreadContext() const
         size_t i = sv->size();
 
         bool clear = true;
-        while(i != 0) 
+        while(i != 0)
         {
             i--;
             if((*sv)[i].context != 0)
@@ -509,7 +509,7 @@ PerThreadImplicitContext::setContext(const Context& newContext)
     }
 }
 
-bool 
+bool
 PerThreadImplicitContext::containsKey(const string& k) const
 {
     const Context* ctx = getThreadContext(false);
@@ -521,7 +521,7 @@ PerThreadImplicitContext::containsKey(const string& k) const
     return p != ctx->end();
 }
 
-string 
+string
 PerThreadImplicitContext::get(const string& k) const
 {
     const Context* ctx = getThreadContext(false);
@@ -537,13 +537,13 @@ PerThreadImplicitContext::get(const string& k) const
     return p->second;
 }
 
-string 
+string
 PerThreadImplicitContext::put(const string& k, const string& v)
 {
     Context* ctx = getThreadContext(true);
 
     string& val = (*ctx)[k];
-    
+
     string oldVal = val;
     val = v;
     return oldVal;
@@ -557,7 +557,7 @@ PerThreadImplicitContext::remove(const string& k)
      {
          return "";
      }
-     
+
      Context::iterator p = ctx->find(k);
      if(p == ctx->end())
      {
@@ -576,7 +576,7 @@ PerThreadImplicitContext::remove(const string& k)
     }
 }
 
-void 
+void
 PerThreadImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStream* s) const
 {
     const Context* threadCtx = getThreadContext(false);
@@ -597,7 +597,7 @@ PerThreadImplicitContext::write(const Context& proxyCtx, ::IceInternal::BasicStr
     }
 }
 
-void 
+void
 PerThreadImplicitContext::combine(const Context& proxyCtx, Context& ctx) const
 {
     const Context* threadCtx = getThreadContext(false);
diff --git a/cpp/src/Ice/ImplicitContextI.h b/cpp/src/Ice/ImplicitContextI.h
index c70885d28c5..3fa3292fb1f 100644
--- a/cpp/src/Ice/ImplicitContextI.h
+++ b/cpp/src/Ice/ImplicitContextI.h
@@ -18,12 +18,14 @@ namespace Ice
 //
 // The base class for all ImplicitContext implementations
 //
+class ImplicitContextI;
+ICE_DEFINE_PTR(ImplicitContextIPtr,ImplicitContextI);
 
 class ImplicitContextI : public ImplicitContext
 {
 public:
-    
-    static ImplicitContextI* create(const std::string&);
+
+    static ImplicitContextIPtr create(const std::string&);
 
 #ifdef _WIN32
     static void cleanupThread();
@@ -45,7 +47,7 @@ public:
 
 };
 
-typedef IceInternal::Handle<ImplicitContextI> ImplicitContextIPtr;
+ICE_DEFINE_PTR(ImplicitContextIPtr, ImplicitContextI);
 
 }
 #endif
diff --git a/cpp/src/Ice/Incoming.cpp b/cpp/src/Ice/Incoming.cpp
index 8b7e8a33ea4..55071b685c1 100644
--- a/cpp/src/Ice/Incoming.cpp
+++ b/cpp/src/Ice/Incoming.cpp
@@ -46,7 +46,12 @@ IceInternal::IncomingBase::IncomingBase(Instance* instance, ResponseHandler* res
     _responseHandler(responseHandler)
 {
     _current.adapter = adapter;
+#ifdef ICE_CPP11_MAPPING
+    ::Ice::ConnectionI* conn = dynamic_cast<::Ice::ConnectionI*>(connection);
+    _current.con = conn ? dynamic_pointer_cast<::Ice::ConnectionI>(conn->shared_from_this()) : nullptr;
+#else
     _current.con = connection;
+#endif
     _current.requestId = requestId;
 }
 
@@ -179,7 +184,7 @@ IceInternal::IncomingBase::__warning(const Exception& ex) const
     if(_current.con)
     {
         Ice::ConnectionInfoPtr connInfo = _current.con->getInfo();
-        Ice::IPConnectionInfoPtr ipConnInfo = Ice::IPConnectionInfoPtr::dynamicCast(connInfo);
+        Ice::IPConnectionInfoPtr ipConnInfo = ICE_DYNAMIC_CAST(Ice::IPConnectionInfo, connInfo);
         if(ipConnInfo)
         {
             out << "\nremote host: " << ipConnInfo->remoteAddress << " remote port: " << ipConnInfo->remotePort;
@@ -200,7 +205,7 @@ IceInternal::IncomingBase::__warning(const string& msg) const
     if(_current.con)
     {
         Ice::ConnectionInfoPtr connInfo = _current.con->getInfo();
-        Ice::IPConnectionInfoPtr ipConnInfo = Ice::IPConnectionInfoPtr::dynamicCast(connInfo);
+        Ice::IPConnectionInfoPtr ipConnInfo = ICE_DYNAMIC_CAST(Ice::IPConnectionInfo, connInfo);
         if(ipConnInfo)
         {
             out << "\nremote host: " << ipConnInfo->remoteAddress << " remote port: " << ipConnInfo->remotePort;
@@ -555,7 +560,14 @@ void
 IceInternal::Incoming::setActive(IncomingAsync& cb)
 {
     assert(_cb == 0);
-    _cb = &cb; // acquires a ref-count
+    //
+    // acquires a ref-count
+    //
+#ifdef ICE_CPP11_MAPPING
+    _cb = cb.shared_from_this();
+#else
+    _cb = &cb;
+#endif
 }
 
 void
diff --git a/cpp/src/Ice/IncomingAsync.cpp b/cpp/src/Ice/IncomingAsync.cpp
index b37f83246f3..3b4820cdbbb 100644
--- a/cpp/src/Ice/IncomingAsync.cpp
+++ b/cpp/src/Ice/IncomingAsync.cpp
@@ -23,8 +23,10 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(IncomingAsync* p) { return p; }
 IceUtil::Shared* Ice::upCast(AMD_Object_ice_invoke* p) { return p; }
+#endif
 
 namespace
 {
@@ -54,7 +56,11 @@ Init init;
 IceInternal::IncomingAsync::IncomingAsync(Incoming& in) :
     IncomingBase(in),
     _instanceCopy(_os.instance()),
+#ifdef ICE_CPP11_MAPPING
+    _responseHandlerCopy(dynamic_pointer_cast<ResponseHandler>(_responseHandler->shared_from_this())),
+#else
     _responseHandlerCopy(_responseHandler),
+#endif
     _retriable(in.isRetriable()),
     _active(true)
 {
@@ -291,6 +297,7 @@ IceInternal::IncomingAsync::__validateResponse(bool ok)
     return true;
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceAsync::Ice::AMD_Object_ice_invoke::AMD_Object_ice_invoke(Incoming& in) :
     IncomingAsync(in)
 {
@@ -338,3 +345,4 @@ IceAsync::Ice::AMD_Object_ice_invoke::ice_response(bool ok, const pair<const Byt
         __response();
     }
 }
+#endif
diff --git a/cpp/src/Ice/Initialize.cpp b/cpp/src/Ice/Initialize.cpp
index bc29df15d75..66d8db8315a 100644
--- a/cpp/src/Ice/Initialize.cpp
+++ b/cpp/src/Ice/Initialize.cpp
@@ -27,19 +27,6 @@ using namespace IceInternal;
 namespace
 {
 
-pair<const Byte*, const Byte*>
-makePair(const vector<Byte>& v)
-{
-    if(v.empty())
-    {
-        return pair<const Byte*, const Byte*>(static_cast<Byte*>(0), static_cast<Byte*>(0));
-    }
-    else
-    {
-        return pair<const Byte*, const Byte*>(&v[0], &v[0] + v.size());
-    }
-}
-
 IceUtil::Mutex* globalMutex = 0;
 Ice::LoggerPtr processLogger;
 
@@ -134,13 +121,13 @@ Ice::stringSeqToArgs(const StringSeq& args, int& argc, char* argv[])
 PropertiesPtr
 Ice::createProperties()
 {
-    return new PropertiesI(IceUtil::getProcessStringConverter());
+    return PropertiesPtr(new PropertiesI(IceUtil::getProcessStringConverter()));
 }
 
 PropertiesPtr
 Ice::createProperties(StringSeq& args, const PropertiesPtr& defaults)
 {
-    return new PropertiesI(args, defaults, IceUtil::getProcessStringConverter());
+    return PropertiesPtr(new PropertiesI(args, defaults, IceUtil::getProcessStringConverter()));
 }
 
 PropertiesPtr
@@ -154,7 +141,7 @@ Ice::createProperties(int& argc, char* argv[], const PropertiesPtr& defaults)
 
 Ice::ThreadHookPlugin::ThreadHookPlugin(const CommunicatorPtr& communicator, const ThreadNotificationPtr& threadHook)
 {
-    if(communicator == 0)
+    if(communicator == ICE_NULLPTR)
     {
         throw PluginInitializationException(__FILE__, __LINE__, "Communicator cannot be null");
     }
@@ -229,18 +216,16 @@ Ice::initialize(int& argc, char* argv[], const InitializationData& initializatio
     InitializationData initData = initializationData;
     initData.properties = createProperties(argc, argv, initData.properties);
 
-    CommunicatorI* communicatorI = new CommunicatorI(initData);
-    CommunicatorPtr result = communicatorI; // For exception safety.
-    communicatorI->finishSetup(argc, argv);
-    return result;
+    CommunicatorIPtr communicator = CommunicatorI::create(initData);
+    communicator->finishSetup(argc, argv);
+    return communicator;
 }
 
 CommunicatorPtr
 Ice::initialize(StringSeq& args, const InitializationData& initializationData, Int version)
 {
-    CommunicatorPtr communicator;
     IceUtilInternal::ArgVector av(args);
-    communicator = initialize(av.argc, av.argv, initializationData, version);
+    CommunicatorPtr communicator = initialize(av.argc, av.argv, initializationData, version);
     args = argsToStringSeq(av.argc, av.argv);
     return communicator;
 }
@@ -254,14 +239,32 @@ Ice::initialize(const InitializationData& initData, Int version)
     //
     checkIceVersion(version);
 
-    CommunicatorI* communicatorI = new CommunicatorI(initData);
-    CommunicatorPtr result = communicatorI; // For exception safety.
+    CommunicatorIPtr communicator = CommunicatorI::create(initData);
     int argc = 0;
     char* argv[] = { 0 };
-    communicatorI->finishSetup(argc, argv);
-    return result;
+    communicator->finishSetup(argc, argv);
+    return communicator;
 }
 
+#ifndef ICE_CPP11_MAPPING
+
+namespace
+{
+
+pair<const Byte*, const Byte*>
+makePair(const vector<Byte>& v)
+{
+    if(v.empty())
+    {
+        return pair<const Byte*, const Byte*>(static_cast<Byte*>(0), static_cast<Byte*>(0));
+    }
+    else
+    {
+        return pair<const Byte*, const Byte*>(&v[0], &v[0] + v.size());
+    }
+}
+
+}
 InputStreamPtr
 Ice::createInputStream(const CommunicatorPtr& communicator, const vector<Byte>& bytes)
 {
@@ -323,18 +326,19 @@ Ice::createOutputStream(const CommunicatorPtr& communicator, const EncodingVersi
 {
     return new OutputStreamI(communicator, v);
 }
+#endif
 
 LoggerPtr
 Ice::getProcessLogger()
 {
     IceUtilInternal::MutexPtrLock<IceUtil::Mutex> lock(globalMutex);
 
-    if(processLogger == 0)
+    if(processLogger == ICE_NULLPTR)
     {
        //
        // TODO: Would be nice to be able to use process name as prefix by default.
        //
-       processLogger = new Ice::LoggerI("", "", true, IceUtil::getProcessStringConverter());
+       processLogger = ICE_MAKE_SHARED(Ice::LoggerI, "", "", true, IceUtil::getProcessStringConverter());
     }
     return processLogger;
 }
@@ -356,7 +360,7 @@ Ice::registerPluginFactory(const std::string& name, PLUGIN_FACTORY factory, bool
 InstancePtr
 IceInternal::getInstance(const CommunicatorPtr& communicator)
 {
-    CommunicatorI* p = dynamic_cast<CommunicatorI*>(communicator.get());
+    CommunicatorIPtr p = ICE_DYNAMIC_CAST(::Ice::CommunicatorI, communicator);
     assert(p);
     return p->_instance;
 }
@@ -364,12 +368,12 @@ IceInternal::getInstance(const CommunicatorPtr& communicator)
 IceUtil::TimerPtr
 IceInternal::getInstanceTimer(const CommunicatorPtr& communicator)
 {
-    CommunicatorI* p = dynamic_cast<CommunicatorI*>(communicator.get());
+    CommunicatorIPtr p = ICE_DYNAMIC_CAST(::Ice::CommunicatorI, communicator);
     assert(p);
     return p->_instance->timer();
 }
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
 Ice::DispatcherPtr
 Ice::newDispatcher(const ::std::function<void (const DispatcherCallPtr&, const ConnectionPtr)>& cb)
 {
@@ -393,9 +397,7 @@ Ice::newDispatcher(const ::std::function<void (const DispatcherCallPtr&, const C
 
     return new Cpp11Dispatcher(cb);
 }
-#endif
 
-#ifdef ICE_CPP11
 Ice::BatchRequestInterceptorPtr
 Ice::newBatchRequestInterceptor(const ::std::function<void (const BatchRequest&, int, int)>& cb)
 {
@@ -417,6 +419,6 @@ Ice::newBatchRequestInterceptor(const ::std::function<void (const BatchRequest&,
         const ::std::function<void (const BatchRequest&, int, int)> _cb;
     };
 
-    return new Cpp11BatchRequestInterceptor(cb);
+    return ICE_MAKE_SHARED(Cpp11BatchRequestInterceptor, cb);
 }
 #endif
diff --git a/cpp/src/Ice/Instance.cpp b/cpp/src/Ice/Instance.cpp
index 4b3590c01de..f3f8e2d768d 100644
--- a/cpp/src/Ice/Instance.cpp
+++ b/cpp/src/Ice/Instance.cpp
@@ -691,7 +691,7 @@ IceInternal::Instance::identityToString(const Identity& ident) const
     }
 }
 
-Ice::ObjectPrx
+Ice::ObjectPrxPtr
 IceInternal::Instance::createAdmin(const ObjectAdapterPtr& adminAdapter, const Identity& adminIdentity)
 {
     ObjectAdapterPtr adapter = adminAdapter;
@@ -759,7 +759,7 @@ IceInternal::Instance::createAdmin(const ObjectAdapterPtr& adminAdapter, const I
     return adapter->createProxy(adminIdentity);
 }
 
-Ice::ObjectPrx
+Ice::ObjectPrxPtr
 IceInternal::Instance::getAdmin()
 {
     Lock sync(*this);
@@ -850,12 +850,12 @@ IceInternal::Instance::addAllAdminFacets()
 void
 IceInternal::Instance::setServerProcessProxy(const ObjectAdapterPtr& adminAdapter, const Identity& adminIdentity)
 {
-    ObjectPrx admin = adminAdapter->createProxy(adminIdentity);
-    LocatorPrx locator = adminAdapter->getLocator();
+    ObjectPrxPtr admin = adminAdapter->createProxy(adminIdentity);
+    LocatorPrxPtr locator = adminAdapter->getLocator();
     const string serverId = _initData.properties->getProperty("Ice.Admin.ServerId");
     if(locator && serverId != "")
     {
-        ProcessPrx process = ProcessPrx::uncheckedCast(admin->ice_facet("Process"));
+        ProcessPrxPtr process = ICE_UNCHECKED_CAST(ProcessPrx, admin->ice_facet("Process"));
         try
         {
             //
@@ -1009,7 +1009,7 @@ IceInternal::Instance::findAllAdminFacets()
 }
 
 void
-IceInternal::Instance::setDefaultLocator(const Ice::LocatorPrx& defaultLocator)
+IceInternal::Instance::setDefaultLocator(const Ice::LocatorPrxPtr& defaultLocator)
 {
     Lock sync(*this);
 
@@ -1022,7 +1022,7 @@ IceInternal::Instance::setDefaultLocator(const Ice::LocatorPrx& defaultLocator)
 }
 
 void
-IceInternal::Instance::setDefaultRouter(const Ice::RouterPrx& defaultRouter)
+IceInternal::Instance::setDefaultRouter(const Ice::RouterPrxPtr& defaultRouter)
 {
     Lock sync(*this);
 
@@ -1222,23 +1222,23 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
                     throw InitializationException(__FILE__, __LINE__, "Both syslog and file logger cannot be enabled.");
                 }
 
-                _initData.logger =
-                    new SysLoggerI(_initData.properties->getProperty("Ice.ProgramName"),
-                                   _initData.properties->getPropertyWithDefault("Ice.SyslogFacility", "LOG_USER"));
+                _initData.logger = ICE_MAKE_SHARED(SysLoggerI,
+                                                   _initData.properties->getProperty("Ice.ProgramName"),
+                                                   _initData.properties->getPropertyWithDefault("Ice.SyslogFacility", "LOG_USER"));
             }
             else
 #endif
             if(!logfile.empty())
             {
-                _initData.logger = new LoggerI(_initData.properties->getProperty("Ice.ProgramName"), logfile);
+                _initData.logger = ICE_MAKE_SHARED(LoggerI, _initData.properties->getProperty("Ice.ProgramName"), logfile);
             }
             else
             {
                 _initData.logger = getProcessLogger();
-                if(LoggerIPtr::dynamicCast(_initData.logger))
+                if(ICE_DYNAMIC_CAST(Logger, _initData.logger))
                 {
-                    _initData.logger = new LoggerI(_initData.properties->getProperty("Ice.ProgramName"), "",
-                                                   logStdErrConvert, _stringConverter);
+                    _initData.logger = ICE_MAKE_SHARED(LoggerI, _initData.properties->getProperty("Ice.ProgramName"), "",
+                                                       logStdErrConvert, _stringConverter);
                 }
             }
         }
@@ -1347,13 +1347,13 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Initi
 
         _dynamicLibraryList = new DynamicLibraryList;
 
-        _pluginManager = new PluginManagerI(communicator, _dynamicLibraryList);
+        _pluginManager = ICE_MAKE_SHARED(PluginManagerI, communicator, _dynamicLibraryList);
 
         _outgoingConnectionFactory = new OutgoingConnectionFactory(communicator, this);
 
         _servantFactoryManager = new ObjectFactoryManager();
 
-        _objectAdapterFactory = new ObjectAdapterFactory(this, communicator);
+        _objectAdapterFactory = ICE_MAKE_SHARED(ObjectAdapterFactory, this, communicator);
 
         _retryQueue = new RetryQueue(this);
 
@@ -1494,7 +1494,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
         const string processFacetName = "Process";
         if(_adminFacetFilter.empty() || _adminFacetFilter.find(processFacetName) != _adminFacetFilter.end())
         {
-            _adminFacets.insert(make_pair(processFacetName, new ProcessI(communicator)));
+            _adminFacets.insert(make_pair(processFacetName, ICE_MAKE_SHARED(ProcessI, communicator)));
         }
 
         //
@@ -1515,7 +1515,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
         PropertiesAdminIPtr propsAdmin;
         if(_adminFacetFilter.empty() || _adminFacetFilter.find(propertiesFacetName) != _adminFacetFilter.end())
         {
-            propsAdmin = new PropertiesAdminI(_initData.properties, _initData.logger);
+            propsAdmin = ICE_MAKE_SHARED(PropertiesAdminI, _initData.properties, _initData.logger);
             _adminFacets.insert(make_pair(propertiesFacetName, propsAdmin));
         }
 
@@ -1525,7 +1525,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
         const string metricsFacetName = "Metrics";
         if(_adminFacetFilter.empty() || _adminFacetFilter.find(metricsFacetName) != _adminFacetFilter.end())
         {
-            CommunicatorObserverIPtr observer = new CommunicatorObserverI(_initData);
+            CommunicatorObserverIPtr observer = ICE_MAKE_SHARED(CommunicatorObserverI, _initData);
             _initData.observer = observer;
             _adminFacets.insert(make_pair(metricsFacetName, observer->getFacet()));
 
@@ -1544,7 +1544,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
     //
     if(_initData.observer)
     {
-        _initData.observer->setObserverUpdater(new ObserverUpdaterI(this));
+        _initData.observer->setObserverUpdater(ICE_MAKE_SHARED(ObserverUpdaterI, this));
     }
 
     //
@@ -1589,7 +1589,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
     //
     if(!_referenceFactory->getDefaultRouter())
     {
-        RouterPrx router = RouterPrx::uncheckedCast(_proxyFactory->propertyToProxy("Ice.Default.Router"));
+        RouterPrxPtr router = ICE_UNCHECKED_CAST(RouterPrx, _proxyFactory->propertyToProxy("Ice.Default.Router"));
         if(router)
         {
             _referenceFactory = _referenceFactory->setDefaultRouter(router);
@@ -1598,7 +1598,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[], const Ice::Communica
 
     if(!_referenceFactory->getDefaultLocator())
     {
-        LocatorPrx locator = LocatorPrx::uncheckedCast(_proxyFactory->propertyToProxy("Ice.Default.Locator"));
+        LocatorPrxPtr locator = ICE_UNCHECKED_CAST(LocatorPrx, _proxyFactory->propertyToProxy("Ice.Default.Locator"));
         if(locator)
         {
             _referenceFactory = _referenceFactory->setDefaultLocator(locator);
@@ -1715,7 +1715,7 @@ IceInternal::Instance::destroy()
 
     if(_initData.observer)
     {
-        CommunicatorObserverIPtr observer = CommunicatorObserverIPtr::dynamicCast(_initData.observer);
+        CommunicatorObserverIPtr observer = ICE_DYNAMIC_CAST(CommunicatorObserverI, _initData.observer);
         if(observer)
         {
             observer->destroy(); // Break cyclic reference counts. Don't clear _observer, it's immutable.
@@ -1723,7 +1723,7 @@ IceInternal::Instance::destroy()
         _initData.observer->setObserverUpdater(0); // Break cyclic reference count.
     }
 
-    LoggerAdminLoggerPtr logger = LoggerAdminLoggerPtr::dynamicCast(_initData.logger);
+    LoggerAdminLoggerPtr logger = ICE_DYNAMIC_CAST(LoggerAdminLogger, _initData.logger);
     if(logger)
     {
         //
diff --git a/cpp/src/Ice/Instance.h b/cpp/src/Ice/Instance.h
index a6e9182b136..32685e2e9b5 100644
--- a/cpp/src/Ice/Instance.h
+++ b/cpp/src/Ice/Instance.h
@@ -58,7 +58,7 @@ class Timer;
 typedef IceUtil::Handle<Timer> TimerPtr;
 
 class MetricsAdminI;
-typedef IceUtil::Handle<MetricsAdminI> MetricsAdminIPtr;
+ICE_DEFINE_PTR(MetricsAdminIPtr, MetricsAdminI);
 
 class RequestHandlerFactory;
 typedef IceUtil::Handle<RequestHandlerFactory> RequestHandlerFactoryPtr;
@@ -116,8 +116,8 @@ public:
     Ice::Identity stringToIdentity(const std::string&) const;
     std::string identityToString(const Ice::Identity&) const;
 
-    Ice::ObjectPrx createAdmin(const Ice::ObjectAdapterPtr&, const Ice::Identity&);
-    Ice::ObjectPrx getAdmin();
+    Ice::ObjectPrxPtr createAdmin(const Ice::ObjectAdapterPtr&, const Ice::Identity&);
+    Ice::ObjectPrxPtr getAdmin();
     void addAdminFacet(const Ice::ObjectPtr&, const std::string&);
     Ice::ObjectPtr removeAdminFacet(const std::string&);
     Ice::ObjectPtr findAdminFacet(const std::string&);
@@ -128,8 +128,8 @@ public:
         return _implicitContext;
     }
 
-    void setDefaultLocator(const Ice::LocatorPrx&);
-    void setDefaultRouter(const Ice::RouterPrx&);
+    void setDefaultLocator(const Ice::LocatorPrxPtr&);
+    void setDefaultRouter(const Ice::RouterPrxPtr&);
 
     void setLogger(const Ice::LoggerPtr&);
     void setThreadHook(const Ice::ThreadNotificationPtr&);
diff --git a/cpp/src/Ice/InstrumentationI.cpp b/cpp/src/Ice/InstrumentationI.cpp
index 60d17e89b21..f5ddd6e6fb4 100644
--- a/cpp/src/Ice/InstrumentationI.cpp
+++ b/cpp/src/Ice/InstrumentationI.cpp
@@ -22,7 +22,7 @@ using namespace IceInternal;
 using namespace Ice::Instrumentation;
 using namespace IceMX;
 
-namespace 
+namespace
 {
 
 Context emptyCtx;
@@ -44,14 +44,14 @@ getThreadStateMetric(ThreadState s)
         assert(false);
         return 0;
     }
-}    
+}
 
-struct ThreadStateChanged 
+struct ThreadStateChanged
 {
     ThreadStateChanged(ThreadState oldState, ThreadState newState) : oldState(oldState), newState(newState)
     {
     }
-    
+
     void operator()(const ThreadMetricsPtr& v)
     {
         if(oldState != ThreadStateIdle)
@@ -75,7 +75,7 @@ public:
     class Attributes : public AttributeResolverT<ConnectionHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &ConnectionHelper::getParent);
@@ -85,8 +85,8 @@ public:
         }
     };
     static Attributes attributes;
-    
-    ConnectionHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, ConnectionState state) : 
+
+    ConnectionHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, ConnectionState state) :
         _connectionInfo(con), _endpoint(endpt), _state(state)
     {
     }
@@ -102,7 +102,7 @@ public:
         if(_id.empty())
         {
             ostringstream os;
-            IPConnectionInfoPtr info = IPConnectionInfoPtr::dynamicCast(_connectionInfo);
+            IPConnectionInfoPtr info = ICE_DYNAMIC_CAST(IPConnectionInfo, _connectionInfo);
             if(info)
             {
                 os << info->localAddress << ':' << info->localPort;
@@ -142,8 +142,8 @@ public:
             return "";
         }
     }
-    
-    string 
+
+    string
     getParent() const
     {
         if(!_connectionInfo->adapterName.empty())
@@ -155,7 +155,7 @@ public:
             return "Communicator";
         }
     }
-    
+
     const ConnectionInfoPtr&
     getConnectionInfo() const
     {
@@ -177,7 +177,7 @@ public:
         }
         return _endpointInfo;
     }
-    
+
 private:
 
     const ConnectionInfoPtr& _connectionInfo;
@@ -196,7 +196,7 @@ public:
     class Attributes : public AttributeResolverT<DispatchHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &DispatchHelper::getParent);
@@ -215,7 +215,7 @@ public:
         }
     };
     static Attributes attributes;
-    
+
     DispatchHelper(const Current& current, int size) : _current(current), _size(size)
     {
     }
@@ -265,7 +265,7 @@ public:
         return _id;
     }
 
-    string 
+    string
     getParent() const
     {
         return _current.adapter->getName();
@@ -336,7 +336,7 @@ public:
     class Attributes : public AttributeResolverT<InvocationHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &InvocationHelper::getParent);
@@ -353,8 +353,8 @@ public:
         }
     };
     static Attributes attributes;
-    
-    InvocationHelper(const ObjectPrx& proxy, const string& op, const Context& ctx = emptyCtx) :
+
+    InvocationHelper(const ObjectPrxPtr& proxy, const string& op, const Context& ctx = emptyCtx) :
         _proxy(proxy), _operation(op), _context(ctx)
     {
     }
@@ -388,23 +388,23 @@ public:
         if(_proxy->ice_isTwoway())
         {
             return "twoway";
-        } 
+        }
         else if(_proxy->ice_isOneway())
         {
             return "oneway";
-        } 
+        }
         else if(_proxy->ice_isBatchOneway())
         {
             return "batch-oneway";
-        } 
+        }
         else if(_proxy->ice_isDatagram())
         {
             return "datagram";
-        } 
+        }
         else if(_proxy->ice_isBatchDatagram())
         {
             return "batch-datagram";
-        } 
+        }
         else
         {
             throw invalid_argument("mode");
@@ -439,13 +439,13 @@ public:
         return _id;
     }
 
-    string 
+    string
     getParent() const
     {
         return "Communicator";
     }
 
-    const ObjectPrx&
+    const ObjectPrxPtr&
     getProxy() const
     {
         return _proxy;
@@ -473,7 +473,7 @@ public:
 
 private:
 
-    const ObjectPrx& _proxy;
+    const ObjectPrxPtr& _proxy;
     const string& _operation;
     const Context& _context;
     mutable string _id;
@@ -488,7 +488,7 @@ public:
     class Attributes : public AttributeResolverT<RemoteInvocationHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &RemoteInvocationHelper::getParent);
@@ -498,8 +498,8 @@ public:
         }
     };
     static Attributes attributes;
-    
-    RemoteInvocationHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, int requestId, int size) : 
+
+    RemoteInvocationHelper(const ConnectionInfoPtr& con, const EndpointPtr& endpt, int requestId, int size) :
         _connectionInfo(con), _endpoint(endpt), _requestId(requestId), _size(size)
     {
     }
@@ -527,8 +527,8 @@ public:
         }
         return _id;
     }
-    
-    string 
+
+    string
     getParent() const
     {
         if(!_connectionInfo->adapterName.empty())
@@ -540,7 +540,7 @@ public:
             return "Communicator";
         }
     }
-    
+
     const ConnectionInfoPtr&
     getConnectionInfo() const
     {
@@ -590,7 +590,7 @@ public:
     class Attributes : public AttributeResolverT<CollocatedInvocationHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &CollocatedInvocationHelper::getParent);
@@ -599,8 +599,8 @@ public:
         }
     };
     static Attributes attributes;
-    
-    CollocatedInvocationHelper(const Ice::ObjectAdapterPtr& adapter, int requestId, int size) : 
+
+    CollocatedInvocationHelper(const Ice::ObjectAdapterPtr& adapter, int requestId, int size) :
         _requestId(requestId), _size(size), _id(adapter->getName())
     {
     }
@@ -620,8 +620,8 @@ public:
     {
         return _id;
     }
-    
-    string 
+
+    string
     getParent() const
     {
         return "Communicator";
@@ -649,7 +649,7 @@ public:
     class Attributes : public AttributeResolverT<ThreadHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &ThreadHelper::_parent);
@@ -657,7 +657,7 @@ public:
         }
     };
     static Attributes attributes;
-    
+
     ThreadHelper(const string& parent, const string& id, ThreadState state) : _parent(parent), _id(id), _state(state)
     {
     }
@@ -676,7 +676,7 @@ public:
     }
 
 private:
-    
+
     const string _parent;
     const string _id;
     const ThreadState _state;
@@ -691,7 +691,7 @@ public:
     class Attributes : public AttributeResolverT<EndpointHelper>
     {
     public:
-        
+
         Attributes()
         {
             add("parent", &EndpointHelper::getParent);
@@ -700,7 +700,7 @@ public:
         }
     };
     static Attributes attributes;
-    
+
     EndpointHelper(const EndpointPtr& endpt, const string& id) : _endpoint(endpt), _id(id)
     {
     }
@@ -747,7 +747,7 @@ public:
     }
 
 private:
-    
+
     const EndpointPtr _endpoint;
     mutable string _id;
     mutable EndpointInfoPtr _endpointInfo;
@@ -757,7 +757,7 @@ EndpointHelper::Attributes EndpointHelper::attributes;
 
 }
 
-void 
+void
 ConnectionObserverI::sentBytes(Int num)
 {
     forEach(add(&ConnectionMetrics::sentBytes, num));
@@ -767,7 +767,7 @@ ConnectionObserverI::sentBytes(Int num)
     }
 }
 
-void 
+void
 ConnectionObserverI::receivedBytes(Int num)
 {
     forEach(add(&ConnectionMetrics::receivedBytes, num));
@@ -849,8 +849,8 @@ InvocationObserverI::userException()
 }
 
 RemoteObserverPtr
-InvocationObserverI::getRemoteObserver(const ConnectionInfoPtr& connection, 
-                                       const EndpointPtr& endpoint, 
+InvocationObserverI::getRemoteObserver(const ConnectionInfoPtr& connection,
+                                       const EndpointPtr& endpoint,
                                        int requestId,
                                        int size)
 {
@@ -861,7 +861,7 @@ InvocationObserverI::getRemoteObserver(const ConnectionInfoPtr& connection,
         {
             delegate = _delegate->getRemoteObserver(connection, endpoint, requestId, size);
         }
-        return getObserverWithDelegate<RemoteObserverI>("Remote", 
+        return getObserverWithDelegate<RemoteObserverI>("Remote",
                                                         RemoteInvocationHelper(connection, endpoint, requestId, size),
                                                         delegate);
     }
@@ -891,7 +891,7 @@ InvocationObserverI::getCollocatedObserver(const Ice::ObjectAdapterPtr& adapter,
     return 0;
 }
 
-CommunicatorObserverI::CommunicatorObserverI(const InitializationData& initData) : 
+CommunicatorObserverI::CommunicatorObserverI(const InitializationData& initData) :
     _metrics(new MetricsAdminI(initData.properties, initData.logger)),
     _delegate(initData.observer),
     _connections(_metrics, "Connection"),
@@ -962,10 +962,10 @@ CommunicatorObserverI::getEndpointLookupObserver(const EndpointPtr& endpt)
     return 0;
 }
 
-ConnectionObserverPtr 
-CommunicatorObserverI::getConnectionObserver(const ConnectionInfoPtr& con, 
+ConnectionObserverPtr
+CommunicatorObserverI::getConnectionObserver(const ConnectionInfoPtr& con,
                                              const EndpointPtr& endpt,
-                                             ConnectionState state, 
+                                             ConnectionState state,
                                              const ConnectionObserverPtr& observer)
 {
     if(_connections.isEnabled())
@@ -989,8 +989,8 @@ CommunicatorObserverI::getConnectionObserver(const ConnectionInfoPtr& con,
     return 0;
 }
 
-ThreadObserverPtr 
-CommunicatorObserverI::getThreadObserver(const string& parent, 
+ThreadObserverPtr
+CommunicatorObserverI::getThreadObserver(const string& parent,
                                          const string& id,
                                          ThreadState state,
                                          const ThreadObserverPtr& observer)
@@ -1016,8 +1016,8 @@ CommunicatorObserverI::getThreadObserver(const string& parent,
     return 0;
 }
 
-InvocationObserverPtr 
-CommunicatorObserverI::getInvocationObserver(const ObjectPrx& proxy, const string& op, const Context& ctx)
+InvocationObserverPtr
+CommunicatorObserverI::getInvocationObserver(const ObjectPrxPtr& proxy, const string& op, const Context& ctx)
 {
     if(_invocations.isEnabled())
     {
@@ -1039,7 +1039,7 @@ CommunicatorObserverI::getInvocationObserver(const ObjectPrx& proxy, const strin
     return 0;
 }
 
-DispatchObserverPtr 
+DispatchObserverPtr
 CommunicatorObserverI::getDispatchObserver(const Current& current, int size)
 {
     if(_dispatch.isEnabled())
@@ -1062,7 +1062,7 @@ CommunicatorObserverI::getDispatchObserver(const Current& current, int size)
     return 0;
 }
 
-const IceInternal::MetricsAdminIPtr& 
+const IceInternal::MetricsAdminIPtr&
 CommunicatorObserverI::getFacet() const
 {
     assert(_metrics);
diff --git a/cpp/src/Ice/InstrumentationI.h b/cpp/src/Ice/InstrumentationI.h
index 53994591414..7ae26d19b2b 100644
--- a/cpp/src/Ice/InstrumentationI.h
+++ b/cpp/src/Ice/InstrumentationI.h
@@ -21,9 +21,8 @@ template<typename T, typename O> class ObserverWithDelegateT : public IceMX::Obs
 public:
 
     typedef O ObserverType;
-    typedef typename IceInternal::Handle<O> ObserverPtrType;
-
-    virtual void 
+    typedef typename ICE_INTERNAL_HANDLE<O> ObserverPtrType;
+    virtual void
     attach()
     {
         IceMX::ObserverT<T>::attach();
@@ -33,7 +32,7 @@ public:
         }
     }
 
-    virtual void 
+    virtual void
     detach()
     {
         IceMX::ObserverT<T>::detach();
@@ -65,11 +64,11 @@ public:
         _delegate = delegate;
     }
 
-    template<typename ObserverImpl, typename ObserverMetricsType, typename ObserverPtrType> ObserverPtrType 
-    getObserverWithDelegate(const std::string& mapName, const IceMX::MetricsHelperT<ObserverMetricsType>& helper, 
+    template<typename ObserverImpl, typename ObserverMetricsType, typename ObserverPtrType> ObserverPtrType
+    getObserverWithDelegate(const std::string& mapName, const IceMX::MetricsHelperT<ObserverMetricsType>& helper,
                             const ObserverPtrType& del)
     {
-        IceInternal::Handle<ObserverImpl> obsv = IceMX::ObserverT<T>::template getObserver<ObserverImpl>(mapName, 
+        ICE_INTERNAL_HANDLE<ObserverImpl> obsv = IceMX::ObserverT<T>::template getObserver<ObserverImpl>(mapName,
                                                                                                          helper);
         if(obsv)
         {
@@ -88,15 +87,15 @@ template<typename T> class ObserverFactoryWithDelegateT : public IceMX::Observer
 {
 public:
 
-    ObserverFactoryWithDelegateT(const IceInternal::MetricsAdminIPtr& metrics, const std::string& name) : 
+    ObserverFactoryWithDelegateT(const IceInternal::MetricsAdminIPtr& metrics, const std::string& name) :
         IceMX::ObserverFactoryT<T>(metrics, name)
     {
     }
 
-    template<typename ObserverMetricsType, typename ObserverPtrType> ObserverPtrType 
+    template<typename ObserverMetricsType, typename ObserverPtrType> ObserverPtrType
     getObserverWithDelegate(const IceMX::MetricsHelperT<ObserverMetricsType>& helper, const ObserverPtrType& del)
     {
-        IceInternal::Handle<T> obsv = IceMX::ObserverFactoryT<T>::getObserver(helper);
+        ICE_INTERNAL_HANDLE<T> obsv = IceMX::ObserverFactoryT<T>::getObserver(helper);
         if(obsv)
         {
             obsv->setDelegate(del);
@@ -105,11 +104,11 @@ public:
         return del;
     }
 
-    template<typename ObserverMetricsType, typename ObserverPtrType> ObserverPtrType 
-    getObserverWithDelegate(const IceMX::MetricsHelperT<ObserverMetricsType>& helper, const ObserverPtrType& del, 
+    template<typename ObserverMetricsType, typename ObserverPtrType> ObserverPtrType
+    getObserverWithDelegate(const IceMX::MetricsHelperT<ObserverMetricsType>& helper, const ObserverPtrType& del,
                             const ObserverPtrType& old)
     {
-        IceInternal::Handle<T> obsv = IceMX::ObserverFactoryT<T>::getObserver(helper, old);
+        ICE_INTERNAL_HANDLE<T> obsv = IceMX::ObserverFactoryT<T>::getObserver(helper, old);
         if(obsv)
         {
             obsv->setDelegate(del);
@@ -129,7 +128,7 @@ void addEndpointAttributes(typename Helper::Attributes& attrs)
     attrs.add("endpointIsSecure", &Helper::getEndpointInfo, &Ice::EndpointInfo::secure);
     attrs.add("endpointTimeout", &Helper::getEndpointInfo, &Ice::EndpointInfo::timeout);
     attrs.add("endpointCompress", &Helper::getEndpointInfo, &Ice::EndpointInfo::compress);
-    
+
     attrs.add("endpointHost", &Helper::getEndpointInfo, &Ice::IPEndpointInfo::host);
     attrs.add("endpointPort", &Helper::getEndpointInfo, &Ice::IPEndpointInfo::port);
 }
@@ -140,19 +139,19 @@ void addConnectionAttributes(typename Helper::Attributes& attrs)
     attrs.add("incoming", &Helper::getConnectionInfo, &Ice::ConnectionInfo::incoming);
     attrs.add("adapterName", &Helper::getConnectionInfo, &Ice::ConnectionInfo::adapterName);
     attrs.add("connectionId", &Helper::getConnectionInfo, &Ice::ConnectionInfo::connectionId);
-    
+
     attrs.add("localHost", &Helper::getConnectionInfo, &Ice::IPConnectionInfo::localAddress);
     attrs.add("localPort", &Helper::getConnectionInfo, &Ice::IPConnectionInfo::localPort);
     attrs.add("remoteHost", &Helper::getConnectionInfo, &Ice::IPConnectionInfo::remoteAddress);
     attrs.add("remotePort", &Helper::getConnectionInfo, &Ice::IPConnectionInfo::remotePort);
-            
+
     attrs.add("mcastHost", &Helper::getConnectionInfo, &Ice::UDPConnectionInfo::mcastAddress);
     attrs.add("mcastPort", &Helper::getConnectionInfo, &Ice::UDPConnectionInfo::mcastPort);
-    
+
     addEndpointAttributes<Helper>(attrs);
 }
 
-class ConnectionObserverI : public ObserverWithDelegateT<IceMX::ConnectionMetrics, 
+class ConnectionObserverI : public ObserverWithDelegateT<IceMX::ConnectionMetrics,
                                                          Ice::Instrumentation::ConnectionObserver>
 {
 public:
@@ -184,7 +183,7 @@ public:
     virtual void reply(Ice::Int);
 };
 
-class CollocatedObserverI : public ObserverWithDelegateT<IceMX::CollocatedMetrics, 
+class CollocatedObserverI : public ObserverWithDelegateT<IceMX::CollocatedMetrics,
                                                          Ice::Instrumentation::CollocatedObserver>
 {
 public:
@@ -192,7 +191,7 @@ public:
     virtual void reply(Ice::Int);
 };
 
-class InvocationObserverI : public ObserverWithDelegateT<IceMX::InvocationMetrics, 
+class InvocationObserverI : public ObserverWithDelegateT<IceMX::InvocationMetrics,
                                                          Ice::Instrumentation::InvocationObserver>
 {
 public:
@@ -201,7 +200,7 @@ public:
 
     virtual void userException();
 
-    virtual Ice::Instrumentation::RemoteObserverPtr 
+    virtual Ice::Instrumentation::RemoteObserverPtr
     getRemoteObserver(const Ice::ConnectionInfoPtr&, const Ice::EndpointPtr&, Ice::Int, Ice::Int);
 
     virtual Ice::Instrumentation::CollocatedObserverPtr
@@ -217,23 +216,23 @@ public:
     CommunicatorObserverI(const Ice::InitializationData&);
 
     virtual void setObserverUpdater(const Ice::Instrumentation::ObserverUpdaterPtr&);
- 
+
     virtual Ice::Instrumentation::ObserverPtr getConnectionEstablishmentObserver(const Ice::EndpointPtr&,
                                                                                  const std::string&);
- 
+
     virtual Ice::Instrumentation::ObserverPtr getEndpointLookupObserver(const Ice::EndpointPtr&);
-    
-    virtual Ice::Instrumentation::ConnectionObserverPtr 
-    getConnectionObserver(const Ice::ConnectionInfoPtr&, 
+
+    virtual Ice::Instrumentation::ConnectionObserverPtr
+    getConnectionObserver(const Ice::ConnectionInfoPtr&,
                           const Ice::EndpointPtr&,
-                          Ice::Instrumentation::ConnectionState, 
+                          Ice::Instrumentation::ConnectionState,
                           const Ice::Instrumentation::ConnectionObserverPtr&);
 
     virtual Ice::Instrumentation::ThreadObserverPtr getThreadObserver(const std::string&, const std::string&,
                                                                       Ice::Instrumentation::ThreadState,
                                                                       const Ice::Instrumentation::ThreadObserverPtr&);
 
-    virtual Ice::Instrumentation::InvocationObserverPtr getInvocationObserver(const Ice::ObjectPrx&, 
+    virtual Ice::Instrumentation::InvocationObserverPtr getInvocationObserver(const Ice::ObjectPrxPtr&,
                                                                               const std::string&,
                                                                               const Ice::Context&);
 
@@ -255,7 +254,7 @@ private:
     ObserverFactoryWithDelegateT<ObserverI> _connects;
     ObserverFactoryWithDelegateT<ObserverI> _endpointLookups;
 };
-typedef IceUtil::Handle<CommunicatorObserverI> CommunicatorObserverIPtr;
+ICE_DEFINE_PTR(CommunicatorObserverIPtr, CommunicatorObserverI);
 
 };
 
diff --git a/cpp/src/Ice/LocatorInfo.cpp b/cpp/src/Ice/LocatorInfo.cpp
index b4ea96998b1..f3477c972cc 100644
--- a/cpp/src/Ice/LocatorInfo.cpp
+++ b/cpp/src/Ice/LocatorInfo.cpp
@@ -18,6 +18,7 @@
 #include <Ice/Reference.h>
 #include <Ice/Functional.h>
 #include <Ice/Properties.h>
+#include <Ice/Comparable.h>
 #include <iterator>
 
 using namespace std;
@@ -44,11 +45,31 @@ public:
     {
         try
         {
+#ifdef ICE_CPP11_MAPPING
+            _locatorInfo->getLocator()->findObjectById_async(
+                _ref->getIdentity(),
+                [this](const ObjectPrxPtr& object)
+                {
+                    this->response(object);
+                },
+                [this](exception_ptr e)
+                {
+                    try
+                    {
+                        rethrow_exception(e);
+                    }
+                    catch(const UserException& ex)
+                    {
+                        this->exception(ex);
+                    }
+                });
+#else
             _locatorInfo->getLocator()->begin_findObjectById(
                 _ref->getIdentity(),
                 newCallback_Locator_findObjectById(static_cast<LocatorInfo::Request*>(this),
                                                    &LocatorInfo::Request::response,
                                                    &LocatorInfo::Request::exception));
+#endif
         }
         catch(const Ice::Exception& ex)
         {
@@ -70,11 +91,31 @@ public:
     {
         try
         {
+#ifdef ICE_CPP11_MAPPING
+            _locatorInfo->getLocator()->findAdapterById_async(
+                _ref->getAdapterId(),
+                [this](const Ice::ObjectPrxPtr& object)
+                {
+                    this->response(object);
+                },
+                [this](exception_ptr e)
+                {
+                    try
+                    {
+                        rethrow_exception(e);
+                    }
+                    catch(const UserException& ex)
+                    {
+                        this->exception(ex);
+                    }
+                });
+#else
             _locatorInfo->getLocator()->begin_findAdapterById(
                 _ref->getAdapterId(),
                 newCallback_Locator_findAdapterById(static_cast<LocatorInfo::Request*>(this),
                                                     &LocatorInfo::Request::response,
                                                     &LocatorInfo::Request::exception));
+#endif
         }
         catch(const Ice::Exception& ex)
         {
@@ -96,8 +137,11 @@ IceInternal::LocatorManager::destroy()
 {
     IceUtil::Mutex::Lock sync(*this);
 
-    for_each(_table.begin(), _table.end(), Ice::secondVoidMemFun<const LocatorPrx, LocatorInfo>(&LocatorInfo::destroy));
-
+#ifdef ICE_CPP11_MAPPING
+    for_each(_table.begin(), _table.end(), [](auto it){ it.second->destroy(); });
+#else
+    for_each(_table.begin(), _table.end(), Ice::secondVoidMemFun<const LocatorPrxPtr, LocatorInfo>(&LocatorInfo::destroy));
+#endif
     _table.clear();
     _tableHint = _table.end();
 
@@ -105,14 +149,14 @@ IceInternal::LocatorManager::destroy()
 }
 
 LocatorInfoPtr
-IceInternal::LocatorManager::get(const LocatorPrx& loc)
+IceInternal::LocatorManager::get(const LocatorPrxPtr& loc)
 {
     if(!loc)
     {
         return 0;
     }
 
-    LocatorPrx locator = LocatorPrx::uncheckedCast(loc->ice_locator(0)); // The locator can't be located.
+    LocatorPrxPtr locator = ICE_UNCHECKED_CAST(LocatorPrx, loc->ice_locator(0)); // The locator can't be located.
 
     //
     // TODO: reap unused locator info objects?
@@ -120,7 +164,7 @@ IceInternal::LocatorManager::get(const LocatorPrx& loc)
 
     IceUtil::Mutex::Lock sync(*this);
 
-    map<LocatorPrx, LocatorInfoPtr>::iterator p = _table.end();
+    map<LocatorPrxPtr, LocatorInfoPtr>::iterator p = _table.end();
 
     if(_tableHint != _table.end())
     {
@@ -152,7 +196,7 @@ IceInternal::LocatorManager::get(const LocatorPrx& loc)
         }
 
         _tableHint = _table.insert(_tableHint,
-                                   pair<const LocatorPrx, LocatorInfoPtr>(locator,
+                                   pair<const LocatorPrxPtr, LocatorInfoPtr>(locator,
                                                                           new LocatorInfo(locator, t->second,
                                                                                           _background)));
     }
@@ -301,7 +345,7 @@ IceInternal::LocatorTable::checkTTL(const IceUtil::Time& time, int ttl) const
 }
 
 void
-IceInternal::LocatorInfo::RequestCallback::response(const LocatorInfoPtr& locatorInfo, const Ice::ObjectPrx& proxy)
+IceInternal::LocatorInfo::RequestCallback::response(const LocatorInfoPtr& locatorInfo, const Ice::ObjectPrxPtr& proxy)
 {
     vector<EndpointIPtr> endpoints;
     if(proxy)
@@ -467,7 +511,7 @@ IceInternal::LocatorInfo::Request::Request(const LocatorInfoPtr& locatorInfo, co
 }
 
 void
-IceInternal::LocatorInfo::Request::response(const Ice::ObjectPrx& proxy)
+IceInternal::LocatorInfo::Request::response(const Ice::ObjectPrxPtr& proxy)
 {
     {
         IceUtil::Monitor<IceUtil::Mutex>::Lock sync(_monitor);
@@ -497,7 +541,7 @@ IceInternal::LocatorInfo::Request::exception(const Ice::Exception& ex)
     }
 }
 
-IceInternal::LocatorInfo::LocatorInfo(const LocatorPrx& locator, const LocatorTablePtr& table, bool background) :
+IceInternal::LocatorInfo::LocatorInfo(const LocatorPrxPtr& locator, const LocatorTablePtr& table, bool background) :
     _locator(locator),
     _table(table),
     _background(background)
@@ -518,22 +562,34 @@ IceInternal::LocatorInfo::destroy()
 bool
 IceInternal::LocatorInfo::operator==(const LocatorInfo& rhs) const
 {
+#ifdef ICE_CPP11_MAPPING
+    return Ice::targetEquals(_locator, rhs._locator);
+#else
     return _locator == rhs._locator;
+#endif
 }
 
 bool
 IceInternal::LocatorInfo::operator!=(const LocatorInfo& rhs) const
 {
+#ifdef ICE_CPP11_MAPPING
+    return !Ice::targetEquals(_locator, rhs._locator);
+#else
     return _locator != rhs._locator;
+#endif
 }
 
 bool
 IceInternal::LocatorInfo::operator<(const LocatorInfo& rhs) const
 {
+#ifdef ICE_CPP11_MAPPING
+    return Ice::targetLess(_locator, rhs._locator);
+#else
     return _locator < rhs._locator;
+#endif
 }
 
-LocatorRegistryPrx
+LocatorRegistryPrxPtr
 IceInternal::LocatorInfo::getLocatorRegistry()
 {
     {
@@ -547,7 +603,7 @@ IceInternal::LocatorInfo::getLocatorRegistry()
     //
     // Do not make locator calls from within sync.
     //
-    LocatorRegistryPrx locatorRegistry = _locator->getRegistry();
+    LocatorRegistryPrxPtr locatorRegistry = _locator->getRegistry();
     if(!locatorRegistry)
     {
         return 0;
@@ -877,7 +933,7 @@ IceInternal::LocatorInfo::getObjectRequest(const ReferencePtr& ref)
 void
 IceInternal::LocatorInfo::finishRequest(const ReferencePtr& ref,
                                         const vector<ReferencePtr>& wellKnownRefs,
-                                        const Ice::ObjectPrx& proxy,
+                                        const Ice::ObjectPrxPtr& proxy,
                                         bool notRegistered)
 {
     if(!proxy || proxy->__reference()->isIndirect())
diff --git a/cpp/src/Ice/LocatorInfo.h b/cpp/src/Ice/LocatorInfo.h
index b283a66bb8b..c719eea134d 100644
--- a/cpp/src/Ice/LocatorInfo.h
+++ b/cpp/src/Ice/LocatorInfo.h
@@ -39,14 +39,14 @@ public:
     // Returns locator info for a given locator. Automatically creates
     // the locator info if it doesn't exist yet.
     //
-    LocatorInfoPtr get(const Ice::LocatorPrx&);
+    LocatorInfoPtr get(const Ice::LocatorPrxPtr&);
 
 private:
 
     const bool _background;
 
-    std::map<Ice::LocatorPrx, LocatorInfoPtr> _table;
-    std::map<Ice::LocatorPrx, LocatorInfoPtr>::iterator _tableHint;
+    std::map<Ice::LocatorPrxPtr, LocatorInfoPtr> _table;
+    std::map<Ice::LocatorPrxPtr, LocatorInfoPtr>::iterator _tableHint;
 
     std::map<std::pair<Ice::Identity, Ice::EncodingVersion>, LocatorTablePtr> _locatorTables;
 };
@@ -94,7 +94,7 @@ public:
 
         RequestCallback(const ReferencePtr&, int, const GetEndpointsCallbackPtr&);
 
-        void response(const LocatorInfoPtr&, const Ice::ObjectPrx&);
+        void response(const LocatorInfoPtr&, const Ice::ObjectPrxPtr&);
         void exception(const LocatorInfoPtr&, const Ice::Exception&);
 
     private:
@@ -112,7 +112,7 @@ public:
         void addCallback(const ReferencePtr&, const ReferencePtr&, int, const GetEndpointsCallbackPtr&);
         std::vector<EndpointIPtr> getEndpoints(const ReferencePtr&, const ReferencePtr&, int, bool&);
 
-        void response(const Ice::ObjectPrx&);
+        void response(const Ice::ObjectPrxPtr&);
         void exception(const Ice::Exception&);
 
     protected:
@@ -131,12 +131,12 @@ public:
         std::vector<ReferencePtr> _wellKnownRefs;
         bool _sent;
         bool _response;
-        Ice::ObjectPrx _proxy;
+        Ice::ObjectPrxPtr _proxy;
         IceUtil::UniquePtr<Ice::Exception> _exception;
     };
     typedef IceUtil::Handle<Request> RequestPtr;
 
-    LocatorInfo(const Ice::LocatorPrx&, const LocatorTablePtr&, bool);
+    LocatorInfo(const Ice::LocatorPrxPtr&, const LocatorTablePtr&, bool);
 
     void destroy();
 
@@ -144,14 +144,14 @@ public:
     bool operator!=(const LocatorInfo&) const;
     bool operator<(const LocatorInfo&) const;
 
-    const Ice::LocatorPrx& getLocator() const
+    const Ice::LocatorPrxPtr& getLocator() const
     {
         //
         // No mutex lock necessary, _locator is immutable.
         //
         return _locator;
     }
-    Ice::LocatorRegistryPrx getLocatorRegistry();
+    Ice::LocatorRegistryPrxPtr getLocatorRegistry();
 
     std::vector<EndpointIPtr> getEndpoints(const ReferencePtr& ref, int ttl, bool& cached)
     {
@@ -176,12 +176,12 @@ private:
     RequestPtr getAdapterRequest(const ReferencePtr&);
     RequestPtr getObjectRequest(const ReferencePtr&);
 
-    void finishRequest(const ReferencePtr&, const std::vector<ReferencePtr>&, const Ice::ObjectPrx&, bool);
+    void finishRequest(const ReferencePtr&, const std::vector<ReferencePtr>&, const Ice::ObjectPrxPtr&, bool);
     friend class Request;
     friend class RequestCallback;
 
-    const Ice::LocatorPrx _locator;
-    Ice::LocatorRegistryPrx _locatorRegistry;
+    const Ice::LocatorPrxPtr _locator;
+    Ice::LocatorRegistryPrxPtr _locatorRegistry;
     const LocatorTablePtr _table;
     const bool _background;
 
diff --git a/cpp/src/Ice/LoggerAdminI.cpp b/cpp/src/Ice/LoggerAdminI.cpp
index b48b40be259..64c68dee606 100644
--- a/cpp/src/Ice/LoggerAdminI.cpp
+++ b/cpp/src/Ice/LoggerAdminI.cpp
@@ -32,19 +32,19 @@ class LoggerAdminI : public Ice::LoggerAdmin
 public:
 
     LoggerAdminI(const PropertiesPtr&);
-    
-    virtual void attachRemoteLogger(const RemoteLoggerPrx&, const LogMessageTypeSeq&, 
+
+    virtual void attachRemoteLogger(const RemoteLoggerPrxPtr&, const LogMessageTypeSeq&,
                                     const StringSeq&, Int, const Current&);
-    
-    virtual bool detachRemoteLogger(const RemoteLoggerPrx&, const Current&);
-    
+
+    virtual bool detachRemoteLogger(const RemoteLoggerPrxPtr&, const Current&);
+
     virtual LogMessageSeq getLog(const LogMessageTypeSeq&, const StringSeq&, Int, string&, const Current&);
 
     void destroy();
 
-    vector<RemoteLoggerPrx> log(const LogMessage&);
+    vector<RemoteLoggerPrxPtr> log(const LogMessage&);
 
-    void deadRemoteLogger(const RemoteLoggerPrx&, const LoggerPtr&, const LocalException&, const string&);
+    void deadRemoteLogger(const RemoteLoggerPrxPtr&, const LoggerPtr&, const LocalException&, const string&);
 
     const int getTraceLevel() const
     {
@@ -53,9 +53,11 @@ public:
 
 private:
 
-    bool removeRemoteLogger(const RemoteLoggerPrx&);
-    
+    bool removeRemoteLogger(const RemoteLoggerPrxPtr&);
+
+#ifndef ICE_CPP11_MAPPING // C++98 mapping begin_init callback
     void initCompleted(const AsyncResultPtr&);
+#endif
 
     IceUtil::Mutex _mutex;
     list<LogMessage> _queue;
@@ -70,7 +72,7 @@ private:
 
     struct ObjectIdentityCompare
     {
-        bool operator()(const RemoteLoggerPrx& lhs, const RemoteLoggerPrx& rhs) const
+        bool operator()(const RemoteLoggerPrxPtr& lhs, const RemoteLoggerPrxPtr& rhs) const
         {
             //
             // Caller should make sure that proxies are never null
@@ -93,7 +95,7 @@ private:
         const set<string> traceCategories;
     };
 
-    typedef map<RemoteLoggerPrx, Filters, ObjectIdentityCompare> RemoteLoggerMap;
+    typedef map<RemoteLoggerPrxPtr, Filters, ObjectIdentityCompare> RemoteLoggerMap;
 
     struct GetRemoteLoggerMapKey
     {
@@ -108,29 +110,29 @@ private:
     CommunicatorPtr _sendLogCommunicator;
     bool _destroyed;
 };
-typedef IceUtil::Handle<LoggerAdminI> LoggerAdminIPtr;
+ICE_DEFINE_PTR(LoggerAdminIPtr, LoggerAdminI);
 
 
 class Job : public IceUtil::Shared
 {
 public:
 
-    Job(const vector<RemoteLoggerPrx>& r, const LogMessage& l) :
+    Job(const vector<RemoteLoggerPrxPtr>& r, const LogMessage& l) :
         remoteLoggers(r),
         logMessage(l)
     {
     }
 
-    const vector<RemoteLoggerPrx> remoteLoggers;
+    const vector<RemoteLoggerPrxPtr> remoteLoggers;
     const LogMessage logMessage;
 };
 typedef IceUtil::Handle<Job> JobPtr;
 
 
-class LoggerAdminLoggerI : public IceInternal::LoggerAdminLogger
+class LoggerAdminLoggerI : public ICE_ENABLE_SHARED_FROM_THIS(LoggerAdminLoggerI), public IceInternal::LoggerAdminLogger
 {
 public:
-    
+
     LoggerAdminLoggerI(const PropertiesPtr&, const LoggerPtr&);
 
     virtual void print(const std::string&);
@@ -141,22 +143,23 @@ public:
     virtual LoggerPtr cloneWithPrefix(const std::string&);
 
     virtual ObjectPtr getFacet() const;
-   
+
     virtual void destroy();
 
     const LoggerPtr& getLocalLogger() const
     {
         return _localLogger;
     }
- 
+
     void run();
 
 private:
 
     void log(const LogMessage&);
-
+#ifndef ICE_CPP11_MAPPING // C++98 mapping begin_log callback
     void logCompleted(const AsyncResultPtr&);
-    
+#endif
+
     LoggerPtr _localLogger;
     const LoggerAdminIPtr _loggerAdmin;
 
@@ -164,9 +167,9 @@ private:
 
     bool _destroyed;
     IceUtil::ThreadPtr _sendLogThread;
-    std::deque<JobPtr> _jobQueue;   
+    std::deque<JobPtr> _jobQueue;
 };
-typedef IceUtil::Handle<LoggerAdminLoggerI> LoggerAdminLoggerIPtr;
+ICE_DEFINE_PTR(LoggerAdminLoggerIPtr, LoggerAdminLoggerI);
 
 
 class SendLogThread : public IceUtil::Thread
@@ -195,7 +198,7 @@ filterLogMessages(LogMessageSeq& logMessages, const set<LogMessageType>& message
                   const set<string>& traceCategories, Int messageMax)
 {
     assert(!logMessages.empty() && messageMax != 0);
-   
+
     //
     // Filter only if one of the 3 filters is set; messageMax < 0 means "give me all"
     // that match the other filters, if any.
@@ -209,7 +212,7 @@ filterLogMessages(LogMessageSeq& logMessages, const set<LogMessageType>& message
             bool keepIt = false;
             if(messageTypes.empty() || messageTypes.count(p->type) != 0)
             {
-                if(p->type != TraceMessage || traceCategories.empty() ||
+                if(p->type != ICE_ENUM(LogMessageType, TraceMessage) || traceCategories.empty() ||
                    traceCategories.count(p->traceCategory) != 0)
                 {
                     keepIt = true;
@@ -246,15 +249,15 @@ filterLogMessages(LogMessageSeq& logMessages, const set<LogMessageType>& message
 //
 // Change this proxy's communicator, while keeping its invocation timeout
 //
-RemoteLoggerPrx
-changeCommunicator(const RemoteLoggerPrx& prx, const CommunicatorPtr& communicator)
+RemoteLoggerPrxPtr
+changeCommunicator(const RemoteLoggerPrxPtr& prx, const CommunicatorPtr& communicator)
 {
     if(prx == 0)
     {
         return 0;
     }
 
-    RemoteLoggerPrx result = RemoteLoggerPrx::uncheckedCast(communicator->stringToProxy(prx->ice_toString()));
+    RemoteLoggerPrxPtr result = ICE_UNCHECKED_CAST(RemoteLoggerPrx, communicator->stringToProxy(prx->ice_toString()));
 
     return result->ice_invocationTimeout(prx->ice_getInvocationTimeout());
 }
@@ -312,7 +315,7 @@ LoggerAdminI::LoggerAdminI(const PropertiesPtr& props) :
     _logCount(0),
     _maxLogCount(props->getPropertyAsIntWithDefault("Ice.Admin.Logger.KeepLogs", 100)),
     _traceCount(0),
-    _maxTraceCount(props->getPropertyAsIntWithDefault("Ice.Admin.Logger.KeepTraces", 100)),   
+    _maxTraceCount(props->getPropertyAsIntWithDefault("Ice.Admin.Logger.KeepTraces", 100)),
     _traceLevel(props->getPropertyAsInt("Ice.Trace.Admin.Logger")),
     _destroyed(false)
 {
@@ -321,7 +324,7 @@ LoggerAdminI::LoggerAdminI(const PropertiesPtr& props) :
 }
 
 void
-LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx,
+LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrxPtr& prx,
                                  const LogMessageTypeSeq& messageTypes,
                                  const StringSeq& categories,
                                  Int messageMax,
@@ -331,13 +334,13 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx,
     {
         return; // can't send this null RemoteLogger anything!
     }
-    
+
     //
     // In C++, LoggerAdminI does not keep a "logger" data member to avoid a hard-to-break circular
     // reference, so we retrieve the logger from Current
     //
-    
-    LoggerAdminLoggerIPtr logger = LoggerAdminLoggerIPtr::dynamicCast(current.adapter->getCommunicator()->getLogger());
+
+    LoggerAdminLoggerIPtr logger = ICE_DYNAMIC_CAST(LoggerAdminLoggerI, current.adapter->getCommunicator()->getLogger());
     if(!logger)
     {
         // Our logger is not installed - must be a bug
@@ -345,7 +348,7 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx,
         return;
     }
 
-    RemoteLoggerPrx remoteLogger = prx->ice_twoway();
+    RemoteLoggerPrxPtr remoteLogger = prx->ice_twoway();
 
     Filters filters(messageTypes, categories);
     LogMessageSeq initLogMessages;
@@ -391,8 +394,37 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx,
         filterLogMessages(initLogMessages, filters.messageTypes, filters.traceCategories, messageMax);
     }
 
+#ifdef ICE_CPP11_MAPPING
+    try
+    {
+        remoteLogger->init_async(logger->getPrefix(), initLogMessages,
+            [this, logger, remoteLogger]()
+            {
+                if(this->_traceLevel > 1)
+                {
+                    Trace trace(logger, traceCategory);
+                    trace << "init on `" << remoteLogger << "' completed successfully";
+                }
+            },
+            [this, logger, remoteLogger](exception_ptr e)
+            {
+                try
+                {
+                    rethrow_exception(e);
+                }
+                catch(const Ice::LocalException& e)
+                {
+                    this->deadRemoteLogger(remoteLogger, logger, e, "init");
+                }
+            });
+    }
+    catch(const LocalException& ex)
+    {
+        deadRemoteLogger(remoteLogger, logger, ex, "init");
+        throw;
+    }
+#else
     CallbackPtr initCompletedCb = newCallback(this, &LoggerAdminI::initCompleted);
-
     try
     {
         remoteLogger->begin_init(logger->getPrefix(), initLogMessages, initCompletedCb, logger);
@@ -402,10 +434,11 @@ LoggerAdminI::attachRemoteLogger(const RemoteLoggerPrx& prx,
         deadRemoteLogger(remoteLogger, logger, ex, "init");
         throw;
     }
+#endif
 }
 
 bool
-LoggerAdminI::detachRemoteLogger(const RemoteLoggerPrx& remoteLogger, const Current& current)
+LoggerAdminI::detachRemoteLogger(const RemoteLoggerPrxPtr& remoteLogger, const Current& current)
 {
     if(remoteLogger == 0)
     {
@@ -429,11 +462,11 @@ LoggerAdminI::detachRemoteLogger(const RemoteLoggerPrx& remoteLogger, const Curr
             trace << "cannot detach `" << remoteLogger << "': not found";
         }
     }
-    
+
     return found;
 }
 
-LogMessageSeq 
+LogMessageSeq
 LoggerAdminI::getLog(const LogMessageTypeSeq& messageTypes, const StringSeq& categories,
                      Int messageMax, string& prefix, const Current& current)
 {
@@ -449,13 +482,13 @@ LoggerAdminI::getLog(const LogMessageTypeSeq& messageTypes, const StringSeq& cat
 
     LoggerPtr logger = current.adapter->getCommunicator()->getLogger();
     prefix = logger->getPrefix();
-    
+
     if(!logMessages.empty())
     {
         Filters filters(messageTypes, categories);
         filterLogMessages(logMessages, filters.messageTypes, filters.traceCategories, messageMax);
     }
-    
+
     return logMessages;
 }
 
@@ -467,14 +500,14 @@ LoggerAdminI::destroy()
         IceUtil::Mutex::Lock lock(_mutex);
         if(!_destroyed)
         {
-            _destroyed = true; 
+            _destroyed = true;
             sendLogCommunicator = _sendLogCommunicator;
             _sendLogCommunicator = 0;
         }
     }
-    
+
     //
-    // Destroy outside lock to avoid deadlock when there are outstanding two-way log calls sent to 
+    // Destroy outside lock to avoid deadlock when there are outstanding two-way log calls sent to
     // remote logggers
     //
     if(sendLogCommunicator)
@@ -483,22 +516,22 @@ LoggerAdminI::destroy()
     }
 }
 
-vector<RemoteLoggerPrx>
+vector<RemoteLoggerPrxPtr>
 LoggerAdminI::log(const LogMessage& logMessage)
 {
-    vector<RemoteLoggerPrx> remoteLoggers;
+    vector<RemoteLoggerPrxPtr> remoteLoggers;
 
     IceUtil::Mutex::Lock lock(_mutex);
 
     //
     // Put message in _queue
     //
-    if((logMessage.type != TraceMessage && _maxLogCount > 0) ||
-       (logMessage.type == TraceMessage && _maxTraceCount > 0))
+    if((logMessage.type != ICE_ENUM(LogMessageType, TraceMessage) && _maxLogCount > 0) ||
+       (logMessage.type == ICE_ENUM(LogMessageType, TraceMessage) && _maxTraceCount > 0))
     {
         list<LogMessage>::iterator p = _queue.insert(_queue.end(), logMessage);
 
-        if(logMessage.type != TraceMessage)
+        if(logMessage.type != ICE_ENUM(LogMessageType, TraceMessage))
         {
             assert(_maxLogCount > 0);
             if(_logCount == _maxLogCount)
@@ -508,7 +541,7 @@ LoggerAdminI::log(const LogMessage& logMessage)
                 //
                 assert(_oldestLog != _queue.end());
                 _oldestLog = _queue.erase(_oldestLog);
-                while(_oldestLog != _queue.end() && _oldestLog->type == TraceMessage)
+                while(_oldestLog != _queue.end() && _oldestLog->type == ICE_ENUM(LogMessageType, TraceMessage))
                 {
                     _oldestLog++;
                 }
@@ -534,7 +567,7 @@ LoggerAdminI::log(const LogMessage& logMessage)
                 //
                 assert(_oldestTrace != _queue.end());
                 _oldestTrace = _queue.erase(_oldestTrace);
-                while(_oldestTrace != _queue.end() && _oldestTrace->type != TraceMessage)
+                while(_oldestTrace != _queue.end() && _oldestTrace->type != ICE_ENUM(LogMessageType, TraceMessage))
                 {
                     _oldestTrace++;
                 }
@@ -560,7 +593,7 @@ LoggerAdminI::log(const LogMessage& logMessage)
 
             if(filters.messageTypes.empty() || filters.messageTypes.count(logMessage.type) != 0)
             {
-                if(logMessage.type != TraceMessage || filters.traceCategories.empty() ||
+                if(logMessage.type != ICE_ENUM(LogMessageType, TraceMessage) || filters.traceCategories.empty() ||
                    filters.traceCategories.count(logMessage.traceCategory) != 0)
                 {
                     remoteLoggers.push_back(p->first);
@@ -572,7 +605,7 @@ LoggerAdminI::log(const LogMessage& logMessage)
 }
 
 void
-LoggerAdminI::deadRemoteLogger(const RemoteLoggerPrx& remoteLogger,
+LoggerAdminI::deadRemoteLogger(const RemoteLoggerPrxPtr& remoteLogger,
                                const LoggerPtr& logger,
                                const LocalException& ex,
                                const string& operation)
@@ -591,39 +624,44 @@ LoggerAdminI::deadRemoteLogger(const RemoteLoggerPrx& remoteLogger,
 }
 
 bool
-LoggerAdminI::removeRemoteLogger(const RemoteLoggerPrx& remoteLogger)
+LoggerAdminI::removeRemoteLogger(const RemoteLoggerPrxPtr& remoteLogger)
 {
     IceUtil::Mutex::Lock lock(_mutex);
     return _remoteLoggerMap.erase(remoteLogger) > 0;
 }
 
+#ifndef ICE_CPP11_MAPPING
+//
+// begin_init callback method for C++98 mapping
+//
 void
 LoggerAdminI::initCompleted(const AsyncResultPtr& r)
 {
-    RemoteLoggerPrx remoteLogger = RemoteLoggerPrx::uncheckedCast(r->getProxy());
-    
-try 
+    RemoteLoggerPrxPtr remoteLogger = ICE_UNCHECKED_CAST(RemoteLoggerPrx, r->getProxy());
+
+    try
     {
         remoteLogger->end_init(r);
 
         if(_traceLevel > 1)
         {
-            LoggerPtr logger = LoggerPtr::dynamicCast(r->getCookie());
+            LoggerPtr logger = ICE_DYNAMIC_CAST(Logger, r->getCookie());
             Trace trace(logger, traceCategory);
             trace << r->getOperation() << " on `" << remoteLogger << "' completed successfully";
         }
     }
     catch(const LocalException& ex)
     {
-        deadRemoteLogger(remoteLogger, LoggerPtr::dynamicCast(r->getCookie()), ex, r->getOperation());
+        deadRemoteLogger(remoteLogger, ICE_DYNAMIC_CAST(Logger, r->getCookie()), ex, r->getOperation());
     }
 }
+#endif
 
 //
 // LoggerAdminLoggerI
 //
 
-LoggerAdminLoggerI::LoggerAdminLoggerI(const PropertiesPtr& props, 
+LoggerAdminLoggerI::LoggerAdminLoggerI(const PropertiesPtr& props,
                                        const LoggerPtr& localLogger) :
     _loggerAdmin(new LoggerAdminI(props)),
     _destroyed(false)
@@ -648,7 +686,7 @@ LoggerAdminLoggerI::LoggerAdminLoggerI(const PropertiesPtr& props,
 void
 LoggerAdminLoggerI::print(const string& message)
 {
-   LogMessage logMessage = { PrintMessage, IceUtil::Time::now().toMicroSeconds(), "", message };
+   LogMessage logMessage = { ICE_ENUM(LogMessageType, PrintMessage), IceUtil::Time::now().toMicroSeconds(), "", message };
 
     _localLogger->print(message);
     log(logMessage);
@@ -657,7 +695,7 @@ LoggerAdminLoggerI::print(const string& message)
 void
 LoggerAdminLoggerI::trace(const string& category, const string& message)
 {
-    LogMessage logMessage = { TraceMessage, IceUtil::Time::now().toMicroSeconds(), category, message };
+    LogMessage logMessage = { ICE_ENUM(LogMessageType, TraceMessage), IceUtil::Time::now().toMicroSeconds(), category, message };
 
     _localLogger->trace(category, message);
     log(logMessage);
@@ -666,7 +704,7 @@ LoggerAdminLoggerI::trace(const string& category, const string& message)
 void
 LoggerAdminLoggerI::warning(const string& message)
 {
-    LogMessage logMessage = { WarningMessage, IceUtil::Time::now().toMicroSeconds(), "", message };
+    LogMessage logMessage = { ICE_ENUM(LogMessageType, WarningMessage), IceUtil::Time::now().toMicroSeconds(), "", message };
 
     _localLogger->warning(message);
     log(logMessage);
@@ -675,7 +713,7 @@ LoggerAdminLoggerI::warning(const string& message)
 void
 LoggerAdminLoggerI::error(const string& message)
 {
-    LogMessage logMessage = { ErrorMessage, IceUtil::Time::now().toMicroSeconds(), "", message };
+    LogMessage logMessage = { ICE_ENUM(LogMessageType, ErrorMessage), IceUtil::Time::now().toMicroSeconds(), "", message };
 
     _localLogger->error(message);
     log(logMessage);
@@ -702,7 +740,7 @@ LoggerAdminLoggerI::getFacet() const
 void
 LoggerAdminLoggerI::log(const LogMessage& logMessage)
 {
-    const vector<RemoteLoggerPrx> remoteLoggers = _loggerAdmin->log(logMessage);
+    const vector<RemoteLoggerPrxPtr> remoteLoggers = _loggerAdmin->log(logMessage);
 
     if(!remoteLoggers.empty())
     {
@@ -710,7 +748,7 @@ LoggerAdminLoggerI::log(const LogMessage& logMessage)
 
         if(!_sendLogThread)
         {
-            _sendLogThread = new SendLogThread(this);
+            _sendLogThread = new SendLogThread(ICE_SHARED_FROM_THIS);
             _sendLogThread->start();
         }
 
@@ -755,7 +793,9 @@ LoggerAdminLoggerI::run()
         trace << "send log thread started";
     }
 
+#ifndef ICE_CPP11_MAPPING
     CallbackPtr logCompletedCb = newCallback(this, &LoggerAdminLoggerI::logCompleted);
+#endif
 
     for(;;)
     {
@@ -774,7 +814,7 @@ LoggerAdminLoggerI::run()
         _jobQueue.pop_front();
         lock.release();
 
-        for(vector<RemoteLoggerPrx>::const_iterator p = job->remoteLoggers.begin(); p != job->remoteLoggers.end(); ++p)
+        for(vector<RemoteLoggerPrxPtr>::const_iterator p = job->remoteLoggers.begin(); p != job->remoteLoggers.end(); ++p)
         {
             if(_loggerAdmin->getTraceLevel() > 1)
             {
@@ -784,10 +824,38 @@ LoggerAdminLoggerI::run()
 
             try
             {
+#ifdef ICE_CPP11_MAPPING
+                RemoteLoggerPrxPtr remoteLogger = *p;
+                remoteLogger->log_async(job->logMessage,
+                    [this, remoteLogger]()
+                    {
+                        if(this->_loggerAdmin->getTraceLevel() > 1)
+                        {
+                            Trace trace(_localLogger, traceCategory);
+                            trace << "log on `" << remoteLogger << "' completed successfully";
+                        }
+                    },
+                    [this, remoteLogger](exception_ptr e)
+                    {
+                        try
+                        {
+                            rethrow_exception(e);
+                        }
+                        catch(const CommunicatorDestroyedException&)
+                        {
+                            // expected if there are outstanding calls during communicator destruction
+                        }
+                        catch(const LocalException& ex)
+                        {
+                            this->_loggerAdmin->deadRemoteLogger(remoteLogger, _localLogger, ex, "log");
+                        }
+                    });
+#else
                 //
                 // *p is a proxy associated with the _sendLogCommunicator
                 //
                 (*p)->begin_log(job->logMessage, logCompletedCb);
+#endif
             }
             catch(const LocalException& ex)
             {
@@ -803,12 +871,16 @@ LoggerAdminLoggerI::run()
     }
 }
 
+#ifndef ICE_CPP11_MAPPING
+//
+// begin_log callback for C++98 mapping
+//
 void
 LoggerAdminLoggerI::logCompleted(const AsyncResultPtr& r)
 {
-    RemoteLoggerPrx remoteLogger = RemoteLoggerPrx::uncheckedCast(r->getProxy());
-    
-    try 
+    RemoteLoggerPrxPtr remoteLogger = ICE_UNCHECKED_CAST(RemoteLoggerPrx, r->getProxy());
+
+    try
     {
         remoteLogger->end_log(r);
 
@@ -827,6 +899,7 @@ LoggerAdminLoggerI::logCompleted(const AsyncResultPtr& r)
         _loggerAdmin->deadRemoteLogger(remoteLogger, _localLogger, ex, r->getOperation());
     }
 }
+#endif
 
 //
 // SendLogThread
@@ -852,11 +925,11 @@ SendLogThread::run()
 namespace IceInternal
 {
 
-LoggerAdminLoggerPtr 
-createLoggerAdminLogger(const PropertiesPtr& props, 
+LoggerAdminLoggerPtr
+createLoggerAdminLogger(const PropertiesPtr& props,
                         const LoggerPtr& localLogger)
 {
-    return new LoggerAdminLoggerI(props, localLogger);
+    return ICE_MAKE_SHARED(LoggerAdminLoggerI, props, localLogger);
 }
 
 }
diff --git a/cpp/src/Ice/LoggerAdminI.h b/cpp/src/Ice/LoggerAdminI.h
index 3d8ce595c53..68796df1ff8 100644
--- a/cpp/src/Ice/LoggerAdminI.h
+++ b/cpp/src/Ice/LoggerAdminI.h
@@ -34,11 +34,11 @@ public:
     // Destroy this logger, in particular join any thread
     // that this logger may have started
     //
-    virtual void destroy() = 0; 
+    virtual void destroy() = 0;
 };
-typedef Handle<LoggerAdminLogger> LoggerAdminLoggerPtr;
+ICE_DEFINE_PTR(LoggerAdminLoggerPtr, LoggerAdminLogger);
 
-LoggerAdminLoggerPtr 
+LoggerAdminLoggerPtr
 createLoggerAdminLogger(const Ice::PropertiesPtr&, const Ice::LoggerPtr&);
 
 }
diff --git a/cpp/src/Ice/LoggerI.cpp b/cpp/src/Ice/LoggerI.cpp
index fcc3ac1d79c..2ecdd689c5e 100644
--- a/cpp/src/Ice/LoggerI.cpp
+++ b/cpp/src/Ice/LoggerI.cpp
@@ -122,7 +122,7 @@ Ice::LoggerI::getPrefix()
 LoggerPtr
 Ice::LoggerI::cloneWithPrefix(const std::string& prefix)
 {
-    return new LoggerI(prefix, _file, _convert, _converter);
+    return ICE_MAKE_SHARED(LoggerI, prefix, _file, _convert, _converter);
 }
 
 void
diff --git a/cpp/src/Ice/LoggerI.h b/cpp/src/Ice/LoggerI.h
index 441b016a08e..d5d6fb0658f 100644
--- a/cpp/src/Ice/LoggerI.h
+++ b/cpp/src/Ice/LoggerI.h
@@ -49,8 +49,7 @@ private:
 #endif
 
 };
-
-typedef IceUtil::Handle<LoggerI> LoggerIPtr;
+ICE_DEFINE_PTR(LoggerIPtr, LoggerI);
 
 }
 
diff --git a/cpp/src/Ice/Makefile b/cpp/src/Ice/Makefile
index de6f29a4b6f..6260ba1a674 100644
--- a/cpp/src/Ice/Makefile
+++ b/cpp/src/Ice/Makefile
@@ -38,7 +38,6 @@ SLICE_OBJS	= BuiltinSequences.o \
 		  ObjectAdapter.o \
 		  ObjectAdapterF.o \
 		  ObjectFactory.o \
-		  ObjectFactoryF.o \
 		  Plugin.o \
 		  PluginF.o \
 		  Process.o \
@@ -142,6 +141,7 @@ OBJS		= Acceptor.o \
 		  UdpConnector.o \
 		  UdpEndpointI.o \
 		  UdpTransceiver.o \
+		  Value.o \
 		  WSAcceptor.o \
 		  WSConnector.o \
 		  WSEndpoint.o \
diff --git a/cpp/src/Ice/Makefile.mak b/cpp/src/Ice/Makefile.mak
index bdae62218d4..db8cddc15ff 100644
--- a/cpp/src/Ice/Makefile.mak
+++ b/cpp/src/Ice/Makefile.mak
@@ -38,7 +38,6 @@ SLICE_OBJS	= .\BuiltinSequences.obj \
 		  .\ObjectAdapter.obj \
 		  .\ObjectAdapterF.obj \
 		  .\ObjectFactory.obj \
-		  .\ObjectFactoryF.obj \
 		  .\Plugin.obj \
 		  .\PluginF.obj \
 		  .\Process.obj \
@@ -52,6 +51,7 @@ SLICE_OBJS	= .\BuiltinSequences.obj \
 		  .\ServantLocator.obj \
 		  .\ServantLocatorF.obj \
 		  .\SliceChecksumDict.obj \
+		  .\Value.obj \
 		  .\Version.obj
 
 WINDOWS_OBJS   =  .\DLLMain.obj
diff --git a/cpp/src/Ice/MetricsAdminI.cpp b/cpp/src/Ice/MetricsAdminI.cpp
index d6020d3940c..a80e1a7c3ab 100644
--- a/cpp/src/Ice/MetricsAdminI.cpp
+++ b/cpp/src/Ice/MetricsAdminI.cpp
@@ -80,7 +80,7 @@ parseRule(const PropertiesPtr& properties, const string& name)
     {
         try
         {
-            regexps.push_back(new MetricsMapI::RegExp(p->first.substr(name.length() + 1), p->second));
+            regexps.push_back(ICE_MAKE_SHARED(MetricsMapI::RegExp, p->first.substr(name.length() + 1), p->second));
         }
         catch(const std::exception&)
         {
@@ -99,7 +99,7 @@ MetricsMapI::RegExp::RegExp(const string& attribute, const string& regexp) : _at
     // No regexp support with MinGW, when MinGW C++11 mode is not experimental
     // we can use std::regex.
     //
-#elif !defined(ICE_CPP11_REGEXP)
+#elif !defined(ICE_CPP11_COMPILER_REGEXP)
     if(regcomp(&_preg, regexp.c_str(), REG_EXTENDED | REG_NOSUB) != 0)
     {
         throw SyscallException(__FILE__, __LINE__); 
@@ -120,7 +120,7 @@ MetricsMapI::RegExp::~RegExp()
     // No regexp support with MinGW, when MinGW C++11 mode is not experimental
     // we can use std::regex.
     //
-#elif !defined(ICE_CPP11_REGEXP)
+#elif !defined(ICE_CPP11_COMPILER_REGEXP)
     regfree(&_preg);
 #endif
 }
@@ -134,7 +134,7 @@ MetricsMapI::RegExp::match(const string& value)
     // we can use std::regex.
     //
     return false;
-#elif !defined(ICE_CPP11_REGEXP)
+#elif !defined(ICE_CPP11_COMPILER_REGEXP)
     return regexec(&_preg, value.c_str(), 0, 0, 0) == 0;
 #else
 #   if _MSC_VER < 1600
@@ -439,7 +439,7 @@ MetricsAdminI::updateViews()
             map<string, MetricsViewIPtr>::const_iterator q = _views.find(viewName);
             if(q == _views.end())
             {
-                q = views.insert(map<string, MetricsViewIPtr>::value_type(viewName, new MetricsViewI(viewName))).first;
+                q = views.insert(map<string, MetricsViewIPtr>::value_type(viewName, ICE_MAKE_SHARED(MetricsViewI, viewName))).first;
             }
             else
             {
diff --git a/cpp/src/Ice/Object.cpp b/cpp/src/Ice/Object.cpp
index 69a17208243..14086c0d81b 100644
--- a/cpp/src/Ice/Object.cpp
+++ b/cpp/src/Ice/Object.cpp
@@ -19,13 +19,15 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 Object* Ice::upCast(Object* p) { return p; }
 
-void 
+void
 Ice::__patch(ObjectPtr& obj, const ObjectPtr& v)
 {
     obj = v;
 }
+#endif
 
 bool
 Ice::Object::operator==(const Object& r) const
@@ -87,16 +89,6 @@ Ice::Object::ice_clone() const
     return 0; // avoid warning with some compilers
 }
 
-void
-Ice::Object::ice_preMarshal()
-{
-}
-
-void
-Ice::Object::ice_postUnmarshal()
-{
-}
-
 DispatchStatus
 Ice::Object::___ice_isA(Incoming& __inS, const Current& __current)
 {
@@ -142,12 +134,6 @@ Ice::Object::___ice_id(Incoming& __inS, const Current& __current)
     return DispatchOK;
 }
 
-Ice::Int
-Ice::Object::ice_operationAttributes(const string&) const
-{
-    return 0;
-}
-
 
 string Ice::Object::__all[] =
 {
@@ -229,6 +215,17 @@ Ice::Object::__dispatch(Incoming& in, const Current& current)
     throw OperationNotExistException(__FILE__, __LINE__, current.id, current.facet, current.operation);
 }
 
+#ifndef ICE_CPP11_MAPPING
+void
+Ice::Object::ice_preMarshal()
+{
+}
+
+void
+Ice::Object::ice_postUnmarshal()
+{
+}
+
 void
 Ice::Object::__write(IceInternal::BasicStream* os) const
 {
@@ -266,13 +263,20 @@ Ice::Object::__writeImpl(const OutputStreamPtr&) const
 {
     throw MarshalException(__FILE__, __LINE__, "class was not generated with stream support");
 }
- 
-void 
+
+void
 Ice::Object::__readImpl(const InputStreamPtr&)
 {
     throw MarshalException(__FILE__, __LINE__, "class was not generated with stream support");
 }
 
+Ice::Int
+Ice::Object::ice_operationAttributes(const string&) const
+{
+    return 0;
+}
+#endif
+
 namespace
 {
 
@@ -281,19 +285,26 @@ operationModeToString(OperationMode mode)
 {
     switch(mode)
     {
-    case Normal:
+    case ICE_ENUM(OperationMode, Normal):
         return "::Ice::Normal";
 
-    case Nonmutating:
+    case ICE_ENUM(OperationMode, Nonmutating):
         return "::Ice::Nonmutating";
 
-    case Idempotent:
+    case ICE_ENUM(OperationMode, Idempotent):
         return "::Ice::Idempotent";
     }
-
+    //
+    // This could not happen with C++11 strong type enums
+    //
+#ifndef ICE_CPP11_MAPPING
     ostringstream os;
     os << "unknown value (" << mode << ")";
     return os.str();
+#else
+    assert(false);
+    return "";
+#endif
 }
 
 }
@@ -303,12 +314,12 @@ Ice::Object::__checkMode(OperationMode expected, OperationMode received)
 {
     if(expected != received)
     {
-        if(expected == Idempotent && received == Nonmutating)
+        if(expected == ICE_ENUM(OperationMode, Idempotent) && received == ICE_ENUM(OperationMode, Nonmutating))
         {
-            // 
+            //
             // Fine: typically an old client still using the deprecated nonmutating keyword
             //
-            
+
             //
             // Note that expected == Nonmutating and received == Idempotent is not ok:
             // the server may still use the deprecated nonmutating keyword to detect updates
@@ -385,6 +396,10 @@ Ice::BlobjectArray::__dispatch(Incoming& in, const Current& current)
 DispatchStatus
 Ice::BlobjectAsync::__dispatch(Incoming& in, const Current& current)
 {
+#ifdef ICE_CPP11_MAPPING
+    // TODO
+    return DispatchAsync;
+#else
     const Byte* inEncaps;
     Int sz;
     in.readParamEncaps(inEncaps, sz);
@@ -402,11 +417,16 @@ Ice::BlobjectAsync::__dispatch(Incoming& in, const Current& current)
         cb->ice_exception();
     }
     return DispatchAsync;
+#endif
 }
 
 DispatchStatus
 Ice::BlobjectArrayAsync::__dispatch(Incoming& in, const Current& current)
 {
+#ifdef ICE_CPP11_MAPPING
+    // TODO
+    return DispatchAsync;
+#else
     pair<const Byte*, const Byte*> inEncaps;
     Int sz;
     in.readParamEncaps(inEncaps.first, sz);
@@ -425,16 +445,17 @@ Ice::BlobjectArrayAsync::__dispatch(Incoming& in, const Current& current)
         cb->ice_exception();
     }
     return DispatchAsync;
+#endif
 }
 
 void
-Ice::ice_writeObject(const OutputStreamPtr& out, const ObjectPtr& p)
+Ice::ice_writeObject(const OutputStreamPtr& out, const ValuePtr& p)
 {
     out->write(p);
 }
 
 void
-Ice::ice_readObject(const InputStreamPtr& in, ObjectPtr& p)
+Ice::ice_readObject(const InputStreamPtr& in, ValuePtr& p)
 {
     in->read(p);
 }
diff --git a/cpp/src/Ice/ObjectAdapterFactory.cpp b/cpp/src/Ice/ObjectAdapterFactory.cpp
index 492ba389f70..66df21a586e 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.cpp
+++ b/cpp/src/Ice/ObjectAdapterFactory.cpp
@@ -18,7 +18,9 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(ObjectAdapterFactory* p) { return p; }
+#endif
 
 void
 IceInternal::ObjectAdapterFactory::shutdown()
@@ -49,7 +51,11 @@ IceInternal::ObjectAdapterFactory::shutdown()
     // Deactivate outside the thread synchronization, to avoid
     // deadlocks.
     //
+#ifdef ICE_CPP11_MAPPING
+    for_each(adapters.begin(), adapters.end(), [](const ObjectAdapterIPtr& adapter) { adapter->deactivate(); });
+#else
     for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(&ObjectAdapter::deactivate));
+#endif
 }
 
 void
@@ -74,7 +80,11 @@ IceInternal::ObjectAdapterFactory::waitForShutdown()
     //
     // Now we wait for deactivation of each object adapter.
     //
+#ifdef ICE_CPP11_MAPPING
+    for_each(adapters.begin(), adapters.end(), [](const ObjectAdapterIPtr& adapter) { adapter->waitForDeactivate(); });
+#else
     for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(&ObjectAdapter::waitForDeactivate));
+#endif
 }
 
 bool
@@ -103,8 +113,11 @@ IceInternal::ObjectAdapterFactory::destroy()
     //
     // Now we destroy each object adapter.
     //
+#ifdef ICE_CPP11_MAPPING
+    for_each(adapters.begin(), adapters.end(), [](const ObjectAdapterIPtr& adapter) { adapter->destroy(); });
+#else
     for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(&ObjectAdapter::destroy));
-
+#endif
     {
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
         _adapters.clear();
@@ -120,12 +133,19 @@ IceInternal::ObjectAdapterFactory::updateObservers(void (ObjectAdapterI::*fn)())
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
         adapters = _adapters;
     }
-
+#ifdef ICE_CPP11_MAPPING
+    for_each(adapters.begin(), adapters.end(), 
+        [fn](const ObjectAdapterIPtr& adapter)
+        {
+            (adapter.get() ->* fn)();
+        });
+#else
     for_each(adapters.begin(), adapters.end(), IceUtil::voidMemFun(fn));
+#endif
 }
 
 ObjectAdapterPtr
-IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const RouterPrx& router)
+IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const RouterPrxPtr& router)
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
 
@@ -138,8 +158,8 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const
     if(name.empty())
     {
         string uuid = IceUtil::generateUUID();
-        adapter = new ObjectAdapterI(_instance, _communicator, this, uuid, true);
-        adapter->initialize(0);
+        adapter = ICE_MAKE_SHARED(ObjectAdapterI, _instance, _communicator, ICE_SHARED_FROM_THIS, uuid, true);
+        adapter->initialize(ICE_NULLPTR);
     }
     else
     {
@@ -147,7 +167,7 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const
         {
             throw AlreadyRegisteredException(__FILE__, __LINE__, "object adapter", name);
         }
-        adapter = new ObjectAdapterI(_instance, _communicator, this, name, false);
+        adapter = ICE_MAKE_SHARED(ObjectAdapterI, _instance, _communicator, ICE_SHARED_FROM_THIS, name, false);
         adapter->initialize(router);
         _adapterNamesInUse.insert(name);
     }
@@ -157,7 +177,7 @@ IceInternal::ObjectAdapterFactory::createObjectAdapter(const string& name, const
 }
 
 ObjectAdapterPtr
-IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy)
+IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrxPtr& proxy)
 {
     list<ObjectAdapterIPtr> adapters;
     {
@@ -165,7 +185,7 @@ IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy)
 
         if(!_instance)
         {
-            return 0;
+            return ICE_NULLPTR;
         }
 
         adapters = _adapters;
@@ -186,7 +206,7 @@ IceInternal::ObjectAdapterFactory::findObjectAdapter(const ObjectPrx& proxy)
         }
     }
 
-    return 0;
+    return ICE_NULLPTR;
 }
 
 void
diff --git a/cpp/src/Ice/ObjectAdapterFactory.h b/cpp/src/Ice/ObjectAdapterFactory.h
index 6434a25b178..d9e52a9a7bb 100644
--- a/cpp/src/Ice/ObjectAdapterFactory.h
+++ b/cpp/src/Ice/ObjectAdapterFactory.h
@@ -19,7 +19,7 @@
 namespace IceInternal
 {
 
-class ObjectAdapterFactory : public ::IceUtil::Shared, public ::IceUtil::Monitor< ::IceUtil::RecMutex>
+class ObjectAdapterFactory : public ICE_ENABLE_SHARED_FROM_THIS(ObjectAdapterFactory), public ::IceUtil::Monitor< ::IceUtil::RecMutex>
 {
 public:
 
@@ -30,15 +30,16 @@ public:
 
     void updateObservers(void (Ice::ObjectAdapterI::*)());
 
-    ::Ice::ObjectAdapterPtr createObjectAdapter(const std::string&, const Ice::RouterPrx&);
-    ::Ice::ObjectAdapterPtr findObjectAdapter(const ::Ice::ObjectPrx&);
+    ::Ice::ObjectAdapterPtr createObjectAdapter(const std::string&, const Ice::RouterPrxPtr&);
+    ::Ice::ObjectAdapterPtr findObjectAdapter(const ::Ice::ObjectPrxPtr&);
     void removeObjectAdapter(const ::Ice::ObjectAdapterPtr&);
     void flushAsyncBatchRequests(const CommunicatorFlushBatchAsyncPtr&) const;
 
-private:
-
     ObjectAdapterFactory(const InstancePtr&, const ::Ice::CommunicatorPtr&);
     virtual ~ObjectAdapterFactory();
+
+private:
+
     friend class Instance;
 
     InstancePtr _instance;
diff --git a/cpp/src/Ice/ObjectAdapterI.cpp b/cpp/src/Ice/ObjectAdapterI.cpp
index 220811dda07..4f30f82b3a5 100644
--- a/cpp/src/Ice/ObjectAdapterI.cpp
+++ b/cpp/src/Ice/ObjectAdapterI.cpp
@@ -95,8 +95,16 @@ Ice::ObjectAdapterI::activate()
         //
         if(_state != StateUninitialized)
         {
+#ifdef ICE_CPP11_MAPPING
+            for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
+                [](const IncomingConnectionFactoryPtr& factory)
+                {
+                    factory->activate();
+                });
+#else
             for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
                      Ice::voidMemFun(&IncomingConnectionFactory::activate));
+#endif
             return;
         }
 
@@ -148,9 +156,16 @@ Ice::ObjectAdapterI::activate()
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
         assert(_state == StateActivating);
 
+#ifdef ICE_CPP11_MAPPING
+            for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
+                [](const IncomingConnectionFactoryPtr& factory)
+                {
+                    factory->activate();
+                });
+#else
         for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
                  Ice::voidMemFun(&IncomingConnectionFactory::activate));
-
+#endif
         _state = StateActive;
         notifyAll();
     }
@@ -164,8 +179,16 @@ Ice::ObjectAdapterI::hold()
     checkForDeactivation();
     _state = StateHeld;
 
+#ifdef ICE_CPP11_MAPPING
+    for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
+        [](const IncomingConnectionFactoryPtr& factory)
+        {
+            factory->hold();
+        });
+#else
     for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
              Ice::voidMemFun(&IncomingConnectionFactory::hold));
+#endif
 }
 
 void
@@ -180,8 +203,16 @@ Ice::ObjectAdapterI::waitForHold()
         incomingConnectionFactories = _incomingConnectionFactories;
     }
 
+#ifdef ICE_CPP11_MAPPING
+    for_each(incomingConnectionFactories.begin(), incomingConnectionFactories.end(),
+        [](const IncomingConnectionFactoryPtr& factory)
+        {
+            factory->waitUntilHolding();
+        });
+#else
     for_each(incomingConnectionFactories.begin(), incomingConnectionFactories.end(),
              Ice::constVoidMemFun(&IncomingConnectionFactory::waitUntilHolding));
+#endif
 }
 
 void
@@ -240,15 +271,23 @@ Ice::ObjectAdapterI::deactivate()
     // Connection::destroy() might block when sending a CloseConnection
     // message.
     //
+#ifdef ICE_CPP11_MAPPING
+    for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
+        [](const IncomingConnectionFactoryPtr& factory)
+        {
+            factory->destroy();
+        });
+#else
     for_each(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
              Ice::voidMemFun(&IncomingConnectionFactory::destroy));
+#endif
 
     //
     // Must be called outside the thread synchronization, because
     // changing the object adapter might block if there are still
     // requests being dispatched.
     //
-    _instance->outgoingConnectionFactory()->removeAdapter(this);
+    _instance->outgoingConnectionFactory()->removeAdapter(ICE_SHARED_FROM_THIS);
 
     {
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -285,8 +324,16 @@ Ice::ObjectAdapterI::waitForDeactivate()
     // Now we wait until all incoming connection factories are
     // finished.
     //
+#ifdef ICE_CPP11_MAPPING
+    for_each(incomingConnectionFactories.begin(), incomingConnectionFactories.end(),
+        [](const IncomingConnectionFactoryPtr& factory)
+        {
+            factory->waitUntilFinished();
+        });
+#else
     for_each(incomingConnectionFactories.begin(), incomingConnectionFactories.end(),
              Ice::voidMemFun(&IncomingConnectionFactory::waitUntilFinished));
+#endif
 }
 
 bool
@@ -343,7 +390,7 @@ Ice::ObjectAdapterI::destroy()
 
     if(_objectAdapterFactory)
     {
-        _objectAdapterFactory->removeObjectAdapter(this);
+        _objectAdapterFactory->removeObjectAdapter(ICE_SHARED_FROM_THIS);
     }
 
     {
@@ -372,13 +419,13 @@ Ice::ObjectAdapterI::destroy()
     }
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::add(const ObjectPtr& object, const Identity& ident)
 {
     return addFacet(object, ident, "");
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::addFacet(const ObjectPtr& object, const Identity& ident, const string& facet)
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -392,13 +439,13 @@ Ice::ObjectAdapterI::addFacet(const ObjectPtr& object, const Identity& ident, co
     return newProxy(ident, facet);
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::addWithUUID(const ObjectPtr& object)
 {
     return addFacetWithUUID(object, "");
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::addFacetWithUUID(const ObjectPtr& object, const string& facet)
 {
     Identity ident;
@@ -484,7 +531,7 @@ Ice::ObjectAdapterI::findAllFacets(const Identity& ident) const
 }
 
 ObjectPtr
-Ice::ObjectAdapterI::findByProxy(const ObjectPrx& proxy) const
+Ice::ObjectAdapterI::findByProxy(const ObjectPrxPtr& proxy) const
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
 
@@ -534,7 +581,7 @@ Ice::ObjectAdapterI::findServantLocator(const string& prefix) const
     return _servantManager->findServantLocator(prefix);
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::createProxy(const Identity& ident) const
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -545,7 +592,7 @@ Ice::ObjectAdapterI::createProxy(const Identity& ident) const
     return newProxy(ident, "");
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::createDirectProxy(const Identity& ident) const
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -556,7 +603,7 @@ Ice::ObjectAdapterI::createDirectProxy(const Identity& ident) const
     return newDirectProxy(ident, "");
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::createIndirectProxy(const Identity& ident) const
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -568,7 +615,7 @@ Ice::ObjectAdapterI::createIndirectProxy(const Identity& ident) const
 }
 
 void
-Ice::ObjectAdapterI::setLocator(const LocatorPrx& locator)
+Ice::ObjectAdapterI::setLocator(const LocatorPrxPtr& locator)
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
 
@@ -577,7 +624,7 @@ Ice::ObjectAdapterI::setLocator(const LocatorPrx& locator)
     _locatorInfo = _instance->locatorManager()->get(locator);
 }
 
-LocatorPrx
+LocatorPrxPtr
 Ice::ObjectAdapterI::getLocator() const
 {
     IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
@@ -635,7 +682,15 @@ Ice::ObjectAdapterI::getEndpoints() const
 
     EndpointSeq endpoints;
     transform(_incomingConnectionFactories.begin(), _incomingConnectionFactories.end(),
-              back_inserter(endpoints), Ice::constMemFun(&IncomingConnectionFactory::endpoint));
+            back_inserter(endpoints), 
+#ifdef ICE_CPP11_MAPPING
+            [](const IncomingConnectionFactoryPtr& factory)
+            {
+                return factory->endpoint();
+            });
+#else
+            Ice::constMemFun(&IncomingConnectionFactory::endpoint));
+#endif
     return endpoints;
 }
 
@@ -650,7 +705,7 @@ Ice::ObjectAdapterI::getPublishedEndpoints() const
 }
 
 bool
-Ice::ObjectAdapterI::isLocal(const ObjectPrx& proxy) const
+Ice::ObjectAdapterI::isLocal(const ObjectPrxPtr& proxy) const
 {
     //
     // NOTE: it's important that isLocal() doesn't perform any blocking operations as
@@ -752,7 +807,15 @@ Ice::ObjectAdapterI::updateConnectionObservers()
         IceUtil::Monitor<IceUtil::RecMutex>::Lock sync(*this);
         f = _incomingConnectionFactories;
     }
+#ifdef ICE_CPP11_MAPPING
+    for_each(f.begin(), f.end(),
+        [](const IncomingConnectionFactoryPtr& factory)
+        {
+            factory->updateConnectionObservers();
+        });
+#else
     for_each(f.begin(), f.end(), Ice::voidMemFun(&IncomingConnectionFactory::updateConnectionObservers));
+#endif
 }
 
 void
@@ -842,7 +905,7 @@ Ice::ObjectAdapterI::getACM() const
 //
 Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const CommunicatorPtr& communicator,
                                     const ObjectAdapterFactoryPtr& objectAdapterFactory, const string& name,
-                                    /*const RouterPrx& router,*/ bool noConfig) :
+                                    /*const RouterPrxPtr& router,*/ bool noConfig) :
     _state(StateUninitialized),
     _instance(instance),
     _communicator(communicator),
@@ -856,7 +919,7 @@ Ice::ObjectAdapterI::ObjectAdapterI(const InstancePtr& instance, const Communica
 }
 
 void
-Ice::ObjectAdapterI::initialize(const RouterPrx& router)
+Ice::ObjectAdapterI::initialize(const RouterPrxPtr& router)
 {
     if(_noConfig)
     {
@@ -944,8 +1007,8 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router)
 
         if(!router)
         {
-            const_cast<RouterPrx&>(router) = RouterPrx::uncheckedCast(
-                _instance->proxyFactory()->propertyToProxy(_name + ".Router"));
+            const_cast<RouterPrxPtr&>(router) = ICE_UNCHECKED_CAST(RouterPrx,
+                                _instance->proxyFactory()->propertyToProxy(_name + ".Router"));
         }
         if(router)
         {
@@ -976,7 +1039,7 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router)
                 // new outgoing connections to the router's client proxy will
                 // use this object adapter for callbacks.
                 //
-                _routerInfo->setAdapter(this);
+                _routerInfo->setAdapter(ICE_SHARED_FROM_THIS);
 
                 //
                 // Also modify all existing outgoing connections to the
@@ -996,7 +1059,7 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router)
             vector<EndpointIPtr> endpoints = parseEndpoints(properties->getProperty(_name + ".Endpoints"), true);
             for(vector<EndpointIPtr>::iterator p = endpoints.begin(); p != endpoints.end(); ++p)
             {
-                IncomingConnectionFactoryPtr factory = new IncomingConnectionFactory(_instance, *p, this);
+                IncomingConnectionFactoryPtr factory = ICE_MAKE_SHARED(IncomingConnectionFactory, _instance, *p, ICE_SHARED_FROM_THIS);
                  factory->initialize();
                 _incomingConnectionFactories.push_back(factory);
             }
@@ -1019,7 +1082,7 @@ Ice::ObjectAdapterI::initialize(const RouterPrx& router)
 
         if(!properties->getProperty(_name + ".Locator").empty())
         {
-            setLocator(LocatorPrx::uncheckedCast(_instance->proxyFactory()->propertyToProxy(_name + ".Locator")));
+            setLocator(ICE_UNCHECKED_CAST(LocatorPrx, _instance->proxyFactory()->propertyToProxy(_name + ".Locator")));
         }
         else
         {
@@ -1054,7 +1117,7 @@ Ice::ObjectAdapterI::~ObjectAdapterI()
     }
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::newProxy(const Identity& ident, const string& facet) const
 {
     if(_id.empty())
@@ -1071,7 +1134,7 @@ Ice::ObjectAdapterI::newProxy(const Identity& ident, const string& facet) const
     }
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::newDirectProxy(const Identity& ident, const string& facet) const
 {
     vector<EndpointIPtr> endpoints = _publishedEndpoints;
@@ -1090,7 +1153,7 @@ Ice::ObjectAdapterI::newDirectProxy(const Identity& ident, const string& facet)
     return _instance->proxyFactory()->referenceToProxy(ref);
 }
 
-ObjectPrx
+ObjectPrxPtr
 Ice::ObjectAdapterI::newIndirectProxy(const Identity& ident, const string& facet, const string& id) const
 {
     //
@@ -1238,14 +1301,14 @@ ObjectAdapterI::parsePublishedEndpoints()
 }
 
 void
-ObjectAdapterI::updateLocatorRegistry(const IceInternal::LocatorInfoPtr& locatorInfo, const Ice::ObjectPrx& proxy)
+ObjectAdapterI::updateLocatorRegistry(const IceInternal::LocatorInfoPtr& locatorInfo, const Ice::ObjectPrxPtr& proxy)
 {
     if(_id.empty() || !locatorInfo)
     {
         return; // Nothing to update.
     }
 
-    LocatorRegistryPrx locatorRegistry = locatorInfo->getLocatorRegistry();
+    LocatorRegistryPrxPtr locatorRegistry = locatorInfo->getLocatorRegistry();
     if(!locatorRegistry)
     {
         return;
diff --git a/cpp/src/Ice/ObjectAdapterI.h b/cpp/src/Ice/ObjectAdapterI.h
index 03e389ec0a1..5addbdfe846 100644
--- a/cpp/src/Ice/ObjectAdapterI.h
+++ b/cpp/src/Ice/ObjectAdapterI.h
@@ -36,9 +36,11 @@ namespace Ice
 {
 
 class ObjectAdapterI;
-typedef IceUtil::Handle<ObjectAdapterI> ObjectAdapterIPtr;
+ICE_DEFINE_PTR(ObjectAdapterIPtr, ObjectAdapterI);
 
-class ObjectAdapterI : public ObjectAdapter, public IceUtil::Monitor<IceUtil::RecMutex>
+class ObjectAdapterI : public ICE_ENABLE_SHARED_FROM_THIS(ObjectAdapterI),
+                       public ObjectAdapter,
+                       public IceUtil::Monitor<IceUtil::RecMutex>
 {
 public:
 
@@ -54,10 +56,10 @@ public:
     virtual bool isDeactivated() const;
     virtual void destroy();
 
-    virtual ObjectPrx add(const ObjectPtr&, const Identity&);
-    virtual ObjectPrx addFacet(const ObjectPtr&, const Identity&, const std::string&);
-    virtual ObjectPrx addWithUUID(const ObjectPtr&);
-    virtual ObjectPrx addFacetWithUUID(const ObjectPtr&, const std::string&);
+    virtual ObjectPrxPtr add(const ObjectPtr&, const Identity&);
+    virtual ObjectPrxPtr addFacet(const ObjectPtr&, const Identity&, const std::string&);
+    virtual ObjectPrxPtr addWithUUID(const ObjectPtr&);
+    virtual ObjectPrxPtr addFacetWithUUID(const ObjectPtr&, const std::string&);
     virtual void addDefaultServant(const ObjectPtr&, const std::string&);
     virtual ObjectPtr remove(const Identity&);
     virtual ObjectPtr removeFacet(const Identity&, const std::string&);
@@ -66,7 +68,7 @@ public:
     virtual ObjectPtr find(const Identity&) const;
     virtual ObjectPtr findFacet(const Identity&, const std::string&) const;
     virtual FacetMap findAllFacets(const Identity&) const;
-    virtual ObjectPtr findByProxy(const ObjectPrx&) const;
+    virtual ObjectPtr findByProxy(const ObjectPrxPtr&) const;
     virtual ObjectPtr findDefaultServant(const std::string&) const;
 
 
@@ -74,18 +76,18 @@ public:
     virtual ServantLocatorPtr removeServantLocator(const std::string&);
     virtual ServantLocatorPtr findServantLocator(const std::string&) const;
 
-    virtual ObjectPrx createProxy(const Identity&) const;
-    virtual ObjectPrx createDirectProxy(const Identity&) const;
-    virtual ObjectPrx createIndirectProxy(const Identity&) const;
+    virtual ObjectPrxPtr createProxy(const Identity&) const;
+    virtual ObjectPrxPtr createDirectProxy(const Identity&) const;
+    virtual ObjectPrxPtr createIndirectProxy(const Identity&) const;
 
-    virtual void setLocator(const LocatorPrx&);
-    virtual Ice::LocatorPrx getLocator() const;
+    virtual void setLocator(const LocatorPrxPtr&);
+    virtual Ice::LocatorPrxPtr getLocator() const;
     virtual void refreshPublishedEndpoints();
 
     virtual EndpointSeq getEndpoints() const;
     virtual EndpointSeq getPublishedEndpoints() const;
 
-    bool isLocal(const ObjectPrx&) const;
+    bool isLocal(const ObjectPrxPtr&) const;
 
     void flushAsyncBatchRequests(const IceInternal::CommunicatorFlushBatchAsyncPtr&);
 
@@ -100,21 +102,22 @@ public:
     IceInternal::ACMConfig getACM() const;
     size_t messageSizeMax() const { return _messageSizeMax; }
 
-private:
-
     ObjectAdapterI(const IceInternal::InstancePtr&, const CommunicatorPtr&,
                    const IceInternal::ObjectAdapterFactoryPtr&, const std::string&, bool);
     virtual ~ObjectAdapterI();
-    void initialize(const RouterPrx&);
+
+private:
+
+    void initialize(const RouterPrxPtr&);
     friend class IceInternal::ObjectAdapterFactory;
 
-    ObjectPrx newProxy(const Identity&, const std::string&) const;
-    ObjectPrx newDirectProxy(const Identity&, const std::string&) const;
-    ObjectPrx newIndirectProxy(const Identity&, const std::string&, const std::string&) const;
+    ObjectPrxPtr newProxy(const Identity&, const std::string&) const;
+    ObjectPrxPtr newDirectProxy(const Identity&, const std::string&) const;
+    ObjectPrxPtr newIndirectProxy(const Identity&, const std::string&, const std::string&) const;
     void checkForDeactivation() const;
     std::vector<IceInternal::EndpointIPtr> parseEndpoints(const std::string&, bool) const;
     std::vector<IceInternal::EndpointIPtr> parsePublishedEndpoints();
-    void updateLocatorRegistry(const IceInternal::LocatorInfoPtr&, const Ice::ObjectPrx&);
+    void updateLocatorRegistry(const IceInternal::LocatorInfoPtr&, const Ice::ObjectPrxPtr&);
     bool filterProperties(Ice::StringSeq&);
 
     enum State
diff --git a/cpp/src/Ice/ObjectFactoryManager.cpp b/cpp/src/Ice/ObjectFactoryManager.cpp
index 835df0b588e..d09ad32afe1 100644
--- a/cpp/src/Ice/ObjectFactoryManager.cpp
+++ b/cpp/src/Ice/ObjectFactoryManager.cpp
@@ -19,7 +19,7 @@ using namespace IceInternal;
 IceUtil::Shared* IceInternal::upCast(ObjectFactoryManager* p) { return p; }
 
 void
-IceInternal::ObjectFactoryManager::add(const ObjectFactoryPtr& factory, const string& id)
+IceInternal::ObjectFactoryManager::add(const ICE_OBJECT_FACTORY& factory, const string& id)
 {
     IceUtil::Mutex::Lock sync(*this);
 
@@ -32,13 +32,13 @@ IceInternal::ObjectFactoryManager::add(const ObjectFactoryPtr& factory, const st
         throw ex;
     }
 
-    _factoryMapHint = _factoryMap.insert(_factoryMapHint, pair<const string, ObjectFactoryPtr>(id, factory));
+    _factoryMapHint = _factoryMap.insert(_factoryMapHint, pair<const string, ICE_OBJECT_FACTORY>(id, factory));
 }
 
 void
 IceInternal::ObjectFactoryManager::remove(const string& id)
 {
-    ObjectFactoryPtr factory = 0;
+    ICE_OBJECT_FACTORY factory = ICE_NULLPTR;
     {
         IceUtil::Mutex::Lock sync(*this);
 
@@ -81,10 +81,12 @@ IceInternal::ObjectFactoryManager::remove(const string& id)
     // Destroy outside the lock
     //
     assert(factory != 0);
+#ifndef ICE_CPP11_MAPPING
     factory->destroy();
+#endif
 }
 
-ObjectFactoryPtr
+ICE_OBJECT_FACTORY
 IceInternal::ObjectFactoryManager::find(const string& id) const
 {
     IceUtil::Mutex::Lock sync(*this);
@@ -112,7 +114,7 @@ IceInternal::ObjectFactoryManager::find(const string& id) const
     }
     else
     {
-        return 0;
+        return ICE_NULLPTR;
     }
 }
 
@@ -124,6 +126,11 @@ IceInternal::ObjectFactoryManager::ObjectFactoryManager() :
 void
 IceInternal::ObjectFactoryManager::destroy()
 {
+#ifdef ICE_CPP11_MAPPING
+    IceUtil::Mutex::Lock sync(*this);
+    _factoryMap.clear();
+    _factoryMapHint = _factoryMap.end();
+#else
     FactoryMap oldMap;
     {
         IceUtil::Mutex::Lock sync(*this);
@@ -136,4 +143,5 @@ IceInternal::ObjectFactoryManager::destroy()
     //
     for_each(oldMap.begin(), oldMap.end(),
              Ice::secondVoidMemFun<const string, ObjectFactory>(&ObjectFactory::destroy));
+#endif
 }
diff --git a/cpp/src/Ice/ObjectFactoryManager.h b/cpp/src/Ice/ObjectFactoryManager.h
index 97efc5305ee..c102d276c2c 100644
--- a/cpp/src/Ice/ObjectFactoryManager.h
+++ b/cpp/src/Ice/ObjectFactoryManager.h
@@ -13,7 +13,7 @@
 #include <IceUtil/Shared.h>
 #include <IceUtil/Mutex.h>
 #include <Ice/ObjectFactoryManagerF.h>
-#include <Ice/ObjectFactoryF.h>
+#include <Ice/ObjectFactory.h>
 
 namespace IceInternal
 {
@@ -22,11 +22,11 @@ class ObjectFactoryManager : public ::IceUtil::Shared, public ::IceUtil::Mutex
 {
 public:
 
-    void add(const ::Ice::ObjectFactoryPtr&, const std::string&);
+    void add(const ICE_OBJECT_FACTORY&, const std::string&);
+    ICE_OBJECT_FACTORY find(const std::string&) const;
+    typedef std::map<std::string, ICE_OBJECT_FACTORY> FactoryMap;
+    
     void remove(const std::string&);
-    ::Ice::ObjectFactoryPtr find(const std::string&) const;
-
-    typedef std::map<std::string, ::Ice::ObjectFactoryPtr> FactoryMap;
 
 private:
 
diff --git a/cpp/src/Ice/ObserverHelper.cpp b/cpp/src/Ice/ObserverHelper.cpp
index d5604b3d973..9fe1ed7f520 100644
--- a/cpp/src/Ice/ObserverHelper.cpp
+++ b/cpp/src/Ice/ObserverHelper.cpp
@@ -23,7 +23,7 @@ Ice::Context emptyCtx;
 
 }
 
-IceInternal::InvocationObserver::InvocationObserver(IceProxy::Ice::Object* proxy, const string& op, const Context* ctx)
+IceInternal::InvocationObserver::InvocationObserver(const Ice::ObjectPrxPtr& proxy, const string& op, const Context* ctx)
 {
     const CommunicatorObserverPtr& obsv = proxy->__reference()->getInstance()->initializationData().observer;
     if(!obsv)
@@ -53,7 +53,7 @@ IceInternal::InvocationObserver::InvocationObserver(IceInternal::Instance* insta
 }
 
 void
-IceInternal::InvocationObserver::attach(IceProxy::Ice::Object* proxy, const string& op, const Context* ctx)
+IceInternal::InvocationObserver::attach(const Ice::ObjectPrxPtr& proxy, const string& op, const Context* ctx)
 {
     const CommunicatorObserverPtr& obsv = proxy->__reference()->getInstance()->initializationData().observer;
     if(!obsv)
diff --git a/cpp/src/Ice/OpaqueEndpointI.cpp b/cpp/src/Ice/OpaqueEndpointI.cpp
index c061eb0acfa..6a15b5e920c 100644
--- a/cpp/src/Ice/OpaqueEndpointI.cpp
+++ b/cpp/src/Ice/OpaqueEndpointI.cpp
@@ -107,7 +107,7 @@ IceInternal::OpaqueEndpointI::streamWrite(BasicStream* s) const
 Ice::EndpointInfoPtr
 IceInternal::OpaqueEndpointI::getInfo() const
 {
-    return new OpaqueEndpointInfoI(_type, _rawEncoding, _rawBytes);
+    return ICE_MAKE_SHARED(OpaqueEndpointInfoI, _type, _rawEncoding, _rawBytes);
 }
 
 Short
@@ -131,7 +131,11 @@ IceInternal::OpaqueEndpointI::timeout() const
 EndpointIPtr
 IceInternal::OpaqueEndpointI::timeout(Int) const
 {
+#ifdef ICE_CPP11_MAPPING
+    return dynamic_pointer_cast<OpaqueEndpointI>(const_pointer_cast<EndpointI>(shared_from_this()));
+#else
     return const_cast<OpaqueEndpointI*>(this);
+#endif
 }
 
 const string&
@@ -143,7 +147,11 @@ IceInternal::OpaqueEndpointI::connectionId() const
 EndpointIPtr
 IceInternal::OpaqueEndpointI::connectionId(const string&) const
 {
+#ifdef ICE_CPP11_MAPPING
+    return dynamic_pointer_cast<OpaqueEndpointI>(const_pointer_cast<EndpointI>(shared_from_this()));
+#else
     return const_cast<OpaqueEndpointI*>(this);
+#endif
 }
 
 bool
@@ -155,7 +163,11 @@ IceInternal::OpaqueEndpointI::compress() const
 EndpointIPtr
 IceInternal::OpaqueEndpointI::compress(bool) const
 {
+#ifdef ICE_CPP11_MAPPING
+    return dynamic_pointer_cast<OpaqueEndpointI>(const_pointer_cast<EndpointI>(shared_from_this()));
+#else
     return const_cast<OpaqueEndpointI*>(this);
+#endif
 }
 
 bool
@@ -173,7 +185,7 @@ IceInternal::OpaqueEndpointI::secure() const
 TransceiverPtr
 IceInternal::OpaqueEndpointI::transceiver() const
 {
-    return 0;
+    return ICE_NULLPTR;
 }
 
 void
@@ -185,14 +197,18 @@ IceInternal::OpaqueEndpointI::connectors_async(Ice::EndpointSelectionType, const
 AcceptorPtr
 IceInternal::OpaqueEndpointI::acceptor(const string&) const
 {
-    return 0;
+    return ICE_NULLPTR;
 }
 
 vector<EndpointIPtr>
 IceInternal::OpaqueEndpointI::expand() const
 {
     vector<EndpointIPtr> endps;
+#ifdef ICE_CPP11_MAPPING
+    endps.push_back(dynamic_pointer_cast<OpaqueEndpointI>(const_pointer_cast<EndpointI>(shared_from_this())));
+#else
     endps.push_back(const_cast<OpaqueEndpointI*>(this));
+#endif
     return endps;
 }
 
@@ -231,7 +247,11 @@ IceInternal::OpaqueEndpointI::options() const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::OpaqueEndpointI::operator==(const EndpointI& r) const
+#else
 IceInternal::OpaqueEndpointI::operator==(const LocalObject& r) const
+#endif
 {
     const OpaqueEndpointI* p = dynamic_cast<const OpaqueEndpointI*>(&r);
     if(!p)
@@ -263,7 +283,11 @@ IceInternal::OpaqueEndpointI::operator==(const LocalObject& r) const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::OpaqueEndpointI::operator<(const EndpointI& r) const
+#else
 IceInternal::OpaqueEndpointI::operator<(const LocalObject& r) const
+#endif
 {
     const OpaqueEndpointI* p = dynamic_cast<const OpaqueEndpointI*>(&r);
     if(!p)
diff --git a/cpp/src/Ice/OpaqueEndpointI.h b/cpp/src/Ice/OpaqueEndpointI.h
index 9c943c59e59..4ea862d4c30 100644
--- a/cpp/src/Ice/OpaqueEndpointI.h
+++ b/cpp/src/Ice/OpaqueEndpointI.h
@@ -45,9 +45,13 @@ public:
     virtual Ice::Int hash() const;
     virtual std::string options() const;
 
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const EndpointI&) const;
+    virtual bool operator<(const EndpointI&) const;
+#else
     virtual bool operator==(const Ice::LocalObject&) const;
     virtual bool operator<(const Ice::LocalObject&) const;
-
+#endif
 
     using EndpointI::connectionId;
 
diff --git a/cpp/src/Ice/Outgoing.cpp b/cpp/src/Ice/Outgoing.cpp
index 14eb27f7693..2cc2c091ae1 100644
--- a/cpp/src/Ice/Outgoing.cpp
+++ b/cpp/src/Ice/Outgoing.cpp
@@ -26,7 +26,7 @@ OutgoingBase::OutgoingBase(Instance* instance) : _os(instance, Ice::currentProto
 {
 }
 
-ProxyOutgoingBase::ProxyOutgoingBase(IceProxy::Ice::Object* proxy, OperationMode mode) :
+ProxyOutgoingBase::ProxyOutgoingBase(const Ice::ObjectPrxPtr& proxy, OperationMode mode) :
     OutgoingBase(proxy->__reference()->getInstance().get()),
     _proxy(proxy),
     _mode(mode),
@@ -280,7 +280,7 @@ ProxyOutgoingBase::invokeImpl()
     return false;
 }
 
-Outgoing::Outgoing(IceProxy::Ice::Object* proxy, const string& operation, OperationMode mode, const Context* context) :
+Outgoing::Outgoing(const Ice::ObjectPrxPtr& proxy, const string& operation, OperationMode mode, const Context* context) :
     ProxyOutgoingBase(proxy, mode),
     _encoding(getCompatibleEncoding(proxy->__reference()->getEncoding())),
     _is(proxy->__reference()->getInstance().get(), Ice::currentProtocolEncoding),
@@ -288,7 +288,6 @@ Outgoing::Outgoing(IceProxy::Ice::Object* proxy, const string& operation, Operat
 {
     checkSupportedProtocol(getCompatibleProtocol(proxy->__reference()->getProtocol()));
     _observer.attach(proxy, operation, context);
-
     switch(_proxy->__reference()->getMode())
     {
         case Reference::ModeTwoway:
@@ -328,7 +327,7 @@ Outgoing::Outgoing(IceProxy::Ice::Object* proxy, const string& operation, Operat
 
         _os.write(static_cast<Ice::Byte>(mode));
 
-        if(context != 0)
+        if(context != &Ice::noExplicitContext)
         {
             //
             // Explicit context
@@ -582,8 +581,8 @@ Outgoing::throwUserException()
     }
 }
 
-ProxyFlushBatch::ProxyFlushBatch(IceProxy::Ice::Object* proxy, const string& operation) :
-    ProxyOutgoingBase(proxy, Ice::Normal)
+ProxyFlushBatch::ProxyFlushBatch(const Ice::ObjectPrxPtr& proxy, const string& operation) :
+    ProxyOutgoingBase(proxy, ICE_ENUM(OperationMode, Normal))
 {
     checkSupportedProtocol(getCompatibleProtocol(proxy->__reference()->getProtocol()));
     _observer.attach(proxy, operation, 0);
diff --git a/cpp/src/Ice/OutgoingAsync.cpp b/cpp/src/Ice/OutgoingAsync.cpp
index ee1e6d5a437..cfe5adda62e 100644
--- a/cpp/src/Ice/OutgoingAsync.cpp
+++ b/cpp/src/Ice/OutgoingAsync.cpp
@@ -22,10 +22,12 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(OutgoingAsyncBase* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(ProxyOutgoingAsyncBase* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(OutgoingAsync* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(CommunicatorFlushBatchAsync* p) { return p; }
+#endif
 
 bool
 OutgoingAsyncBase::sent()
@@ -52,12 +54,20 @@ OutgoingAsyncBase::getIs()
     return 0; // Must be overriden by request that can handle responses
 }
 
+#ifdef ICE_CPP11_MAPPING
+OutgoingAsyncBase::OutgoingAsyncBase(const CommunicatorPtr& communicator,
+                                     const InstancePtr& instance,
+                                     const string& operation,
+                                     const CallbackBasePtr& delegate) :
+    AsyncResult(communicator, instance, operation, delegate),
+#else
 OutgoingAsyncBase::OutgoingAsyncBase(const CommunicatorPtr& communicator,
                                      const InstancePtr& instance,
                                      const string& operation,
                                      const CallbackBasePtr& delegate,
                                      const LocalObjectPtr& cookie) :
     AsyncResult(communicator, instance, operation, delegate, cookie),
+#endif
     _os(instance.get(), Ice::currentProtocolEncoding)
 {
 }
@@ -83,7 +93,7 @@ OutgoingAsyncBase::finished(const Exception& ex)
     return AsyncResult::finished(ex);
 }
 
-Ice::ObjectPrx
+Ice::ObjectPrxPtr
 ProxyOutgoingAsyncBase::getProxy() const
 {
     return _proxy;
@@ -101,7 +111,11 @@ ProxyOutgoingAsyncBase::completed(const Exception& exc)
     _cachedConnection = 0;
     if(_proxy->__reference()->getInvocationTimeout() == -2)
     {
+#ifdef ICE_CPP11_MAPPING
+        _instance->timer()->cancel(dynamic_pointer_cast<TimerTask>(shared_from_this()));
+#else
         _instance->timer()->cancel(this);
+#endif
     }
 
     //
@@ -115,7 +129,12 @@ ProxyOutgoingAsyncBase::completed(const Exception& exc)
         // the retry interval is 0. This method can be called with the
         // connection locked so we can't just retry here.
         //
+#ifdef ICE_CPP11_MAPPING
+        _instance->retryQueue()->add(dynamic_pointer_cast<ProxyOutgoingAsyncBase>(shared_from_this()),
+                                     handleException(exc));
+#else
         _instance->retryQueue()->add(this, handleException(exc));
+#endif
         return false;
     }
     catch(const Exception& ex)
@@ -136,7 +155,11 @@ ProxyOutgoingAsyncBase::retryException(const Exception& ex)
         // connection to be done.
         //
         _proxy->__updateRequestHandler(_handler, 0); // Clear request handler and always retry.
+#ifdef ICE_CPP11_MAPPING
+        _instance->retryQueue()->add(dynamic_pointer_cast<ProxyOutgoingAsyncBase>(shared_from_this()), 0);
+#else
         _instance->retryQueue()->add(this, 0);
+#endif
     }
     catch(const Ice::Exception& exc)
     {
@@ -155,7 +178,12 @@ ProxyOutgoingAsyncBase::cancelable(const CancellationHandlerPtr& handler)
         const int timeout = _cachedConnection->timeout();
         if(timeout > 0)
         {
+#ifdef ICE_CPP11_MAPPING
+            _instance->timer()->schedule(dynamic_pointer_cast<TimerTask>(shared_from_this()),
+                                         IceUtil::Time::milliSeconds(timeout));
+#else
             _instance->timer()->schedule(this, IceUtil::Time::milliSeconds(timeout));
+#endif
         }
     }
     AsyncResult::cancelable(handler);
@@ -187,13 +215,20 @@ ProxyOutgoingAsyncBase::abort(const Ice::Exception& ex)
     }
 }
 
-ProxyOutgoingAsyncBase::ProxyOutgoingAsyncBase(const ObjectPrx& prx,
+#ifdef ICE_CPP11_MAPPING
+ProxyOutgoingAsyncBase::ProxyOutgoingAsyncBase(const ObjectPrxPtr& prx,
+                                               const string& operation,
+                                               const CallbackBasePtr& delegate) :
+    OutgoingAsyncBase(prx->ice_getCommunicator(), prx->__reference()->getInstance(), operation, delegate),
+#else
+ProxyOutgoingAsyncBase::ProxyOutgoingAsyncBase(const ObjectPrxPtr& prx,
                                                const string& operation,
                                                const CallbackBasePtr& delegate,
                                                const LocalObjectPtr& cookie) :
     OutgoingAsyncBase(prx->ice_getCommunicator(), prx->__reference()->getInstance(), operation, delegate, cookie),
+#endif
     _proxy(prx),
-    _mode(Normal),
+    _mode(ICE_ENUM(OperationMode, Normal)),
     _cnt(0),
     _sent(false)
 {
@@ -209,7 +244,12 @@ ProxyOutgoingAsyncBase::invokeImpl(bool userThread)
             int invocationTimeout = _proxy->__reference()->getInvocationTimeout();
             if(invocationTimeout > 0)
             {
+#ifdef ICE_CPP11_MAPPING
+                _instance->timer()->schedule(dynamic_pointer_cast<TimerTask>(shared_from_this()),
+                                             IceUtil::Time::milliSeconds(invocationTimeout));
+#else
                 _instance->timer()->schedule(this, IceUtil::Time::milliSeconds(invocationTimeout));
+#endif
             }
         }
         else
@@ -223,7 +263,12 @@ ProxyOutgoingAsyncBase::invokeImpl(bool userThread)
             {
                 _sent = false;
                 _handler = _proxy->__getRequestHandler();
+#ifdef ICE_CPP11_MAPPING
+                AsyncStatus status = _handler->sendAsyncRequest(
+                                                    dynamic_pointer_cast<ProxyOutgoingAsyncBase>(shared_from_this()));
+#else
                 AsyncStatus status = _handler->sendAsyncRequest(this);
+#endif
                 if(status & AsyncStatusSent)
                 {
                     if(userThread)
@@ -258,7 +303,12 @@ ProxyOutgoingAsyncBase::invokeImpl(bool userThread)
                 int interval = handleException(ex);
                 if(interval > 0)
                 {
+#ifdef ICE_CPP11_MAPPING
+                    _instance->retryQueue()->add(dynamic_pointer_cast<ProxyOutgoingAsyncBase>(shared_from_this()),
+                                                 interval);
+#else
                     _instance->retryQueue()->add(this, interval);
+#endif
                     return;
                 }
                 else
@@ -293,7 +343,11 @@ ProxyOutgoingAsyncBase::sent(bool done)
     {
         if(_proxy->__reference()->getInvocationTimeout() != -1)
         {
-            _instance->timer()->cancel(this);
+#ifdef ICE_CPP11_MAPPING
+            _instance->timer()->cancel(dynamic_pointer_cast<TimerTask>(shared_from_this()));
+#else
+            _instance->timer()->cancel(this);      
+#endif
         }
     }
     return OutgoingAsyncBase::sent(done);
@@ -304,7 +358,11 @@ ProxyOutgoingAsyncBase::finished(const Exception& ex)
 {
     if(_proxy->__reference()->getInvocationTimeout() != -1)
     {
-        _instance->timer()->cancel(this);
+#ifdef ICE_CPP11_MAPPING
+        _instance->timer()->cancel(dynamic_pointer_cast<TimerTask>(shared_from_this()));
+#else
+        _instance->timer()->cancel(this);      
+#endif
     }
     return OutgoingAsyncBase::finished(ex);
 }
@@ -314,7 +372,11 @@ ProxyOutgoingAsyncBase::finished(bool ok)
 {
     if(_proxy->__reference()->getInvocationTimeout() != -1)
     {
-        _instance->timer()->cancel(this);
+#ifdef ICE_CPP11_MAPPING
+        _instance->timer()->cancel(dynamic_pointer_cast<TimerTask>(shared_from_this()));
+#else
+        _instance->timer()->cancel(this);      
+#endif
     }
     return AsyncResult::finished(ok);
 }
@@ -338,11 +400,18 @@ ProxyOutgoingAsyncBase::runTimerTask()
     }
 }
 
-OutgoingAsync::OutgoingAsync(const ObjectPrx& prx,
+#ifdef ICE_CPP11_MAPPING
+OutgoingAsync::OutgoingAsync(const ObjectPrxPtr& prx,
+                             const string& operation,
+                             const CallbackBasePtr& delegate) :
+    ProxyOutgoingAsyncBase(prx, operation, delegate),
+#else
+OutgoingAsync::OutgoingAsync(const ObjectPrxPtr& prx,
                              const string& operation,
                              const CallbackBasePtr& delegate,
                              const LocalObjectPtr& cookie) :
     ProxyOutgoingAsyncBase(prx, operation, delegate, cookie),
+#endif
     _encoding(getCompatibleEncoding(prx->__reference()->getEncoding()))
 {
 }
@@ -353,7 +422,7 @@ OutgoingAsync::prepare(const string& operation, OperationMode mode, const Contex
     checkSupportedProtocol(getCompatibleProtocol(_proxy->__reference()->getProtocol()));
 
     _mode = mode;
-    _observer.attach(_proxy.get(), operation, context);
+    _observer.attach(_proxy, operation, context);
 
     switch(_proxy->__reference()->getMode())
     {
@@ -394,7 +463,7 @@ OutgoingAsync::prepare(const string& operation, OperationMode mode, const Contex
 
     _os.write(static_cast<Byte>(_mode));
 
-    if(context != 0)
+    if(context != &Ice::noExplicitContext)
     {
         //
         // Explicit context
@@ -429,7 +498,11 @@ AsyncStatus
 OutgoingAsync::invokeRemote(const ConnectionIPtr& connection, bool compress, bool response)
 {
     _cachedConnection = connection;
+#ifdef ICE_CPP11_MAPPING
+    return connection->sendAsyncRequest(dynamic_pointer_cast<OutgoingAsyncBase>(shared_from_this()), compress, response, 0);
+#else
     return connection->sendAsyncRequest(this, compress, response, 0);
+#endif
 }
 
 AsyncStatus
@@ -620,13 +693,20 @@ OutgoingAsync::completed()
     }
 }
 
-ProxyFlushBatchAsync::ProxyFlushBatchAsync(const ObjectPrx& proxy,
+#ifdef ICE_CPP11_MAPPING
+ProxyFlushBatchAsync::ProxyFlushBatchAsync(const ObjectPrxPtr& proxy,
+                                           const string& operation,
+                                           const CallbackBasePtr& delegate) :
+    ProxyOutgoingAsyncBase(proxy, operation, delegate)
+#else
+ProxyFlushBatchAsync::ProxyFlushBatchAsync(const ObjectPrxPtr& proxy,
                                            const string& operation,
                                            const CallbackBasePtr& delegate,
                                            const LocalObjectPtr& cookie) :
     ProxyOutgoingAsyncBase(proxy, operation, delegate, cookie)
+#endif
 {
-    _observer.attach(proxy.get(), operation, 0);
+    _observer.attach(proxy, operation, 0);
     _batchRequestNum = proxy->__getBatchRequestQueue()->swap(&_os);
 }
 
@@ -645,7 +725,12 @@ ProxyFlushBatchAsync::invokeRemote(const ConnectionIPtr& connection, bool compre
         }
     }
     _cachedConnection = connection;
+#ifdef ICE_CPP11_MAPPING
+    return connection->sendAsyncRequest(dynamic_pointer_cast<OutgoingAsyncBase>(shared_from_this()),
+                                        compress, false, _batchRequestNum);
+#else
     return connection->sendAsyncRequest(this, compress, false, _batchRequestNum);
+#endif
 }
 
 AsyncStatus
@@ -672,13 +757,20 @@ ProxyFlushBatchAsync::invoke()
     invokeImpl(true); // userThread = true
 }
 
-ProxyGetConnection::ProxyGetConnection(const ObjectPrx& prx,
+#ifdef ICE_CPP11_MAPPING
+ProxyGetConnection::ProxyGetConnection(const ObjectPrxPtr& prx,
+                                       const string& operation,
+                                       const CallbackBasePtr& delegate) :
+    ProxyOutgoingAsyncBase(prx, operation, delegate)
+#else
+ProxyGetConnection::ProxyGetConnection(const ObjectPrxPtr& prx,
                                        const string& operation,
                                        const CallbackBasePtr& delegate,
                                        const LocalObjectPtr& cookie) :
     ProxyOutgoingAsyncBase(prx, operation, delegate, cookie)
+#endif
 {
-    _observer.attach(prx.get(), operation, 0);
+    _observer.attach(prx, operation, 0);
 }
 
 AsyncStatus
@@ -708,13 +800,23 @@ ProxyGetConnection::invoke()
     invokeImpl(true); // userThread = true
 }
 
+#ifdef ICE_CPP11_MAPPING
+ConnectionFlushBatchAsync::ConnectionFlushBatchAsync(const ConnectionIPtr& connection,
+                                                     const CommunicatorPtr& communicator,
+                                                     const InstancePtr& instance,
+                                                     const string& operation,
+                                                     const CallbackBasePtr& delegate) :
+    OutgoingAsyncBase(communicator, instance, operation, delegate),
+#else
 ConnectionFlushBatchAsync::ConnectionFlushBatchAsync(const ConnectionIPtr& connection,
                                                      const CommunicatorPtr& communicator,
                                                      const InstancePtr& instance,
                                                      const string& operation,
                                                      const CallbackBasePtr& delegate,
                                                      const LocalObjectPtr& cookie) :
-    OutgoingAsyncBase(communicator, instance, operation, delegate, cookie), _connection(connection)
+    OutgoingAsyncBase(communicator, instance, operation, delegate, cookie),
+#endif
+    _connection(connection)
 {
     _observer.attach(instance.get(), operation);
 }
@@ -742,7 +844,12 @@ ConnectionFlushBatchAsync::invoke()
         }
         else
         {
+#ifdef ICE_CPP11_MAPPING
+            status = _connection->sendAsyncRequest(
+                    dynamic_pointer_cast<OutgoingAsyncBase>(shared_from_this()), false, false, batchRequestNum);
+#else
             status = _connection->sendAsyncRequest(this, false, false, batchRequestNum);
+#endif
         }
 
         if(status & AsyncStatusSent)
@@ -770,12 +877,20 @@ ConnectionFlushBatchAsync::invoke()
     }
 }
 
+#ifdef ICE_CPP11_MAPPING
+CommunicatorFlushBatchAsync::CommunicatorFlushBatchAsync(const CommunicatorPtr& communicator,
+                                                         const InstancePtr& instance,
+                                                         const string& operation,
+                                                         const CallbackBasePtr& cb) :
+    AsyncResult(communicator, instance, operation, cb)
+#else
 CommunicatorFlushBatchAsync::CommunicatorFlushBatchAsync(const CommunicatorPtr& communicator,
                                                          const InstancePtr& instance,
                                                          const string& operation,
                                                          const CallbackBasePtr& cb,
                                                          const LocalObjectPtr& cookie) :
     AsyncResult(communicator, instance, operation, cb, cookie)
+#endif
 {
     _observer.attach(instance.get(), operation);
 
@@ -797,7 +912,11 @@ CommunicatorFlushBatchAsync::flushConnection(const ConnectionIPtr& con)
         FlushBatch(const CommunicatorFlushBatchAsyncPtr& outAsync,
                    const InstancePtr& instance,
                    InvocationObserver& observer) :
+#ifdef ICE_CPP11_MAPPING
+            OutgoingAsyncBase(outAsync->getCommunicator(), instance, outAsync->getOperation(), __dummyCallback),
+#else
             OutgoingAsyncBase(outAsync->getCommunicator(), instance, outAsync->getOperation(), __dummyCallback, 0),
+#endif
             _outAsync(outAsync),
             _observer(observer)
         {
@@ -836,7 +955,12 @@ CommunicatorFlushBatchAsync::flushConnection(const ConnectionIPtr& con)
 
     try
     {
+#ifdef ICE_CPP11_MAPPING
+        auto flushBatch = make_shared<FlushBatch>(
+            dynamic_pointer_cast<CommunicatorFlushBatchAsync>(shared_from_this()), _instance, _observer);
+#else
         OutgoingAsyncBasePtr flushBatch = new FlushBatch(this, _instance, _observer);
+#endif
         int batchRequestNum = con->getBatchRequestQueue()->swap(flushBatch->getOs());
         if(batchRequestNum == 0)
         {
@@ -885,3 +1009,248 @@ CommunicatorFlushBatchAsync::check(bool userThread)
         }
     }
 }
+
+#ifdef ICE_CPP11_MAPPING
+OnewayClosureCallback::OnewayClosureCallback(
+    const string& name,
+    const shared_ptr<Ice::ObjectPrx>& proxy,
+    function<void ()> response,
+    function<void (exception_ptr)> exception,
+    function<void (bool)> sent) :
+    __name(name),
+    __proxy(proxy),
+    __response(response),
+    __exception(exception),
+    __sent(sent)
+{
+}
+
+void
+OnewayClosureCallback::sent(const AsyncResultPtr& __result) const
+{
+    if(__sent)
+    {
+        __sent(__result->sentSynchronously());
+    }
+}
+
+bool
+OnewayClosureCallback::hasSentCallback() const
+{
+    return __sent != nullptr;
+}
+
+void
+OnewayClosureCallback::completed(const AsyncResultPtr& __result) const
+{
+    try
+    {
+        AsyncResult::__check(__result, __proxy.get(), __name);
+        bool ok = __result->__wait();
+        if(__proxy->__reference()->getMode() == Reference::ModeTwoway)
+        {
+            if(!ok)
+            {
+                try
+                {
+                    __result->__throwUserException();
+                }
+                catch(const UserException& __ex)
+                {
+                    throw UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
+                }
+            }
+            __result->__readEmptyParams();
+            if(__response)
+            {
+                try
+                {
+                    __response();
+                }
+                catch(...)
+                {
+                    throw current_exception();
+                }
+            }
+        }
+    }
+    catch(const exception_ptr& ex)
+    {
+        rethrow_exception(ex);
+    }
+    catch(const Ice::Exception&)
+    {
+        if(__exception)
+        {
+            __exception(current_exception());
+        }
+    }
+}
+
+function<void ()>
+OnewayClosureCallback::invoke(
+    const string& __name,
+    const shared_ptr<Ice::ObjectPrx>& __proxy,
+    Ice::OperationMode __mode,
+    Ice::FormatType __format,
+    function<void (BasicStream*)> __marshal,
+    function<void ()> __response,
+    function<void (exception_ptr)> __exception,
+    function<void (bool)> __sent,
+    const Ice::Context& __context)
+{
+    auto __result = make_shared<OutgoingAsync>(__proxy, __name, 
+        make_shared<OnewayClosureCallback>(__name, __proxy, move(__response), move(__exception), move(__sent)));
+    try
+    {
+        __result->prepare(__name, __mode, &__context);
+        if(__marshal)
+        {
+            __marshal(__result->startWriteParams(__format));
+            __result->endWriteParams();
+        }
+        else
+        {
+            __result->writeEmptyParams();
+        }
+        __result->invoke();
+    }
+    catch(const exception_ptr& ex)
+    {
+        rethrow_exception(ex);
+    }
+    catch(const Exception& __ex)
+    {
+        __result->abort(__ex);
+    }
+    
+    return [__result]()
+        {
+            __result->cancel();
+        };
+}
+
+TwowayClosureCallback::TwowayClosureCallback(
+    const string& name,
+    const shared_ptr<Ice::ObjectPrx>& proxy,
+    bool readEmptyParams,
+    function<void (BasicStream*)> read,
+    function<void (const UserException&)> userException,
+    function<void (exception_ptr)> exception,
+    function<void (bool)> sent) :
+    __name(name),
+    __proxy(proxy),
+    __readEmptyParams(readEmptyParams),
+    __read(move(read)),
+    __userException(move(userException)),
+    __exception(move(exception)),
+    __sent(move(sent))
+{
+}
+
+void
+TwowayClosureCallback::sent(const AsyncResultPtr& result) const
+{
+    if(__sent != nullptr)
+    {
+        __sent(result->sentSynchronously());
+    }
+}
+
+bool
+TwowayClosureCallback::hasSentCallback() const
+{
+    return __sent != nullptr;
+}
+
+void
+TwowayClosureCallback::completed(const AsyncResultPtr& __result) const
+{
+    try
+    {
+        AsyncResult::__check(__result, __proxy.get(), __name);
+        if(!__result->__wait())
+        {
+            try
+            {
+                __result->__throwUserException();
+            }
+            catch(const Ice::UserException& __ex)
+            {
+                if(__userException)
+                {
+                    __userException(__ex);
+                }
+                throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
+            }
+        }
+        else
+        {
+            if(__readEmptyParams)
+            {
+                __result->__readEmptyParams();
+                __read(0);
+            }
+            else
+            {
+                __read(__result->__startReadParams());
+            }
+        }
+    }
+    catch(const exception_ptr& ex)
+    {
+        rethrow_exception(ex);
+    }
+    catch(const Ice::Exception&)
+    {
+        if(__exception)
+        {
+            __exception(current_exception());
+        }
+    }
+}
+
+function<void ()>
+TwowayClosureCallback::invoke(
+    const string& __name, 
+    const shared_ptr<Ice::ObjectPrx>& __proxy,
+    OperationMode __mode,
+    FormatType __format,
+    function<void (BasicStream*)> __write,
+    bool __readEmptyParams,
+    function<void (BasicStream*)> __read,
+    function<void (const UserException&)> __userException,
+    function<void (exception_ptr)> __exception,
+    function<void (bool)> __sent,
+    const Context& __context)
+{
+    assert(__proxy);
+    auto __result = make_shared<OutgoingAsync>(__proxy, __name, 
+        make_shared<TwowayClosureCallback>(__name, __proxy, __readEmptyParams, move(__read),
+                                           move(__userException), move(__exception), move(__sent)));
+    __proxy->__checkAsyncTwowayOnly(__name);
+    try
+    {
+        __result->prepare(__name, __mode, &__context);
+        if(__write)
+        {
+            __write(__result->startWriteParams(__format));
+            __result->endWriteParams();
+        }
+        else
+        {
+            __result->writeEmptyParams();
+        }
+        __result->invoke();
+    }
+    catch(const Exception& __ex)
+    {
+        __result->abort(__ex);
+    }
+    
+    return [__result]()
+        {
+            __result->cancel();
+        };
+}
+#endif
diff --git a/cpp/src/Ice/PluginManagerI.cpp b/cpp/src/Ice/PluginManagerI.cpp
index e3186298a9c..f0bf409c3f4 100644
--- a/cpp/src/Ice/PluginManagerI.cpp
+++ b/cpp/src/Ice/PluginManagerI.cpp
@@ -440,7 +440,6 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St
         cmdArgs = properties->parseCommandLineOptions(name, cmdArgs);
     }
 
-    PluginPtr plugin;
     PLUGIN_FACTORY factory = 0;
     DynamicLibraryPtr library;
 
@@ -487,7 +486,7 @@ Ice::PluginManagerI::loadPlugin(const string& name, const string& pluginSpec, St
     // Invoke the factory function. No exceptions can be raised
     // by the factory function because it's declared extern "C".
     //
-    plugin = factory(_communicator, name, args);
+    PluginPtr plugin(factory(_communicator, name, args));
     if(!plugin)
     {
         PluginInitializationException e(__FILE__, __LINE__);
diff --git a/cpp/src/Ice/PluginManagerI.h b/cpp/src/Ice/PluginManagerI.h
index ef9a1dd9275..97aa03990a6 100644
--- a/cpp/src/Ice/PluginManagerI.h
+++ b/cpp/src/Ice/PluginManagerI.h
@@ -34,10 +34,10 @@ public:
     virtual PluginPtr getPlugin(const std::string&);
     virtual void addPlugin(const std::string&, const PluginPtr&);
     virtual void destroy();
+    PluginManagerI(const CommunicatorPtr&, const IceInternal::DynamicLibraryListPtr&);
 
 private:
 
-    PluginManagerI(const CommunicatorPtr&, const IceInternal::DynamicLibraryListPtr&);
     friend class IceInternal::Instance;
 
     void loadPlugins(int&, char*[]);
diff --git a/cpp/src/Ice/PropertiesAdminI.cpp b/cpp/src/Ice/PropertiesAdminI.cpp
index 58095fbf0dc..4cd90f614ba 100644
--- a/cpp/src/Ice/PropertiesAdminI.cpp
+++ b/cpp/src/Ice/PropertiesAdminI.cpp
@@ -44,8 +44,15 @@ PropertiesAdminI::getPropertiesForPrefix(const string& prefix, const Current&)
 }
 
 void
+#ifdef ICE_CPP11_MAPPING
+PropertiesAdminI::setProperties_async(const PropertyDict& props,
+                                      function<void ()> response,
+                                      function<void (const ::std::exception_ptr&)>,
+                                      const Current&)
+#else
 PropertiesAdminI::setProperties_async(const AMD_PropertiesAdmin_setPropertiesPtr& cb, const PropertyDict& props,
-                                           const Current&)
+                                      const Current&)
+#endif
 {
     Lock sync(*this);
 
@@ -164,7 +171,11 @@ PropertiesAdminI::setProperties_async(const AMD_PropertiesAdmin_setPropertiesPtr
     // Send the response now so that we do not block the client during
     // the call to the update callback.
     //
+#ifdef ICE_CPP11_MAPPING
+    response();
+#else
     cb->ice_response();
+#endif
 
     //
     // Copy the callbacks to allow callbacks to update the callbacks.
diff --git a/cpp/src/Ice/PropertiesAdminI.h b/cpp/src/Ice/PropertiesAdminI.h
index 46553e06b1d..789a6aee6d5 100644
--- a/cpp/src/Ice/PropertiesAdminI.h
+++ b/cpp/src/Ice/PropertiesAdminI.h
@@ -27,7 +27,13 @@ public:
 
     virtual std::string getProperty(const std::string&, const Ice::Current&);
     virtual Ice::PropertyDict getPropertiesForPrefix(const std::string&, const Ice::Current&);
+
+#ifdef ICE_CPP11_MAPPING
+    virtual void setProperties_async(const ::Ice::PropertyDict&, ::std::function<void ()>,
+                                     ::std::function<void (const ::std::exception_ptr&)>, const Ice::Current&);
+#else
     virtual void setProperties_async(const Ice::AMD_PropertiesAdmin_setPropertiesPtr&, const Ice::PropertyDict&, const Ice::Current&);
+#endif
 
     virtual void addUpdateCallback(const Ice::PropertiesAdminUpdateCallbackPtr&);
     virtual void removeUpdateCallback(const Ice::PropertiesAdminUpdateCallbackPtr&);
@@ -38,7 +44,7 @@ private:
     const Ice::LoggerPtr _logger;
     std::vector<Ice::PropertiesAdminUpdateCallbackPtr> _updateCallbacks;
 };
-typedef IceUtil::Handle<PropertiesAdminI> PropertiesAdminIPtr;
+ICE_DEFINE_PTR(PropertiesAdminIPtr, PropertiesAdminI);
 
 }
 
diff --git a/cpp/src/Ice/PropertiesI.cpp b/cpp/src/Ice/PropertiesI.cpp
index 83c120f5607..136596187c1 100644
--- a/cpp/src/Ice/PropertiesI.cpp
+++ b/cpp/src/Ice/PropertiesI.cpp
@@ -435,7 +435,7 @@ PropertiesPtr
 Ice::PropertiesI::clone()
 {
     IceUtil::Mutex::Lock sync(*this);
-    return new PropertiesI(this);
+    return ICE_MAKE_SHARED(PropertiesI, this);
 }
 
 set<string>
diff --git a/cpp/src/Ice/PropertiesI.h b/cpp/src/Ice/PropertiesI.h
index d3b1bcee3c5..e4190cdf7da 100644
--- a/cpp/src/Ice/PropertiesI.h
+++ b/cpp/src/Ice/PropertiesI.h
@@ -19,10 +19,11 @@
 namespace Ice
 {
 
-class PropertiesI : public Properties, public IceUtil::Mutex
+class PropertiesI : public Properties,
+                    public IceUtil::Mutex
 {
 public:
-    
+
     virtual std::string getProperty(const std::string&);
     virtual std::string getPropertyWithDefault(const std::string&, const std::string&);
     virtual Ice::Int getPropertyAsInt(const std::string&);
@@ -40,10 +41,11 @@ public:
 
     std::set<std::string> getUnusedProperties();
 
+    PropertiesI(const PropertiesI*);
+    
 private:
     PropertiesI(const IceUtil::StringConverterPtr&);
     PropertiesI(StringSeq&, const PropertiesPtr&, const IceUtil::StringConverterPtr&);
-    PropertiesI(const PropertiesI*);
 
     friend ICE_API PropertiesPtr createProperties();
     friend ICE_API PropertiesPtr createProperties(StringSeq&, const PropertiesPtr&);
diff --git a/cpp/src/Ice/Protocol.cpp b/cpp/src/Ice/Protocol.cpp
index 01f35c19a04..91f07b40ae9 100644
--- a/cpp/src/Ice/Protocol.cpp
+++ b/cpp/src/Ice/Protocol.cpp
@@ -121,11 +121,11 @@ namespace Ice
 
 const EncodingVersion currentEncoding = { IceInternal::encodingMajor, IceInternal::encodingMinor };
 const ProtocolVersion currentProtocol = { IceInternal::protocolMajor, IceInternal::protocolMinor };
-
 //
 // The encoding to use for protocol messages, this version is tied to
 // the protocol version.
 //
+
 const EncodingVersion currentProtocolEncoding = { IceInternal::protocolEncodingMajor,
                                                   IceInternal::protocolEncodingMinor };
 
diff --git a/cpp/src/Ice/Proxy.cpp b/cpp/src/Ice/Proxy.cpp
index 48e85f9dc36..58b91db04ca 100644
--- a/cpp/src/Ice/Proxy.cpp
+++ b/cpp/src/Ice/Proxy.cpp
@@ -29,6 +29,11 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+namespace Ice
+{
+const Context noExplicitContext;
+}
+
 namespace
 {
 
@@ -42,12 +47,487 @@ const string ice_flushBatchRequests_name = "ice_flushBatchRequests";
 
 }
 
-::Ice::ObjectPrx
-IceInternal::checkedCastImpl(const ObjectPrx& b, const string& f, const string& typeId, const Context* context)
+#ifdef ICE_CPP11_MAPPING // C++11 mapping
+
+bool
+Ice::ObjectPrx::operator==(const ObjectPrx& r) const
+{
+    return _reference == r._reference;
+}
+
+bool
+Ice::ObjectPrx::operator!=(const ObjectPrx& r) const
+{
+    return _reference != r._reference;
+}
+
+bool
+Ice::ObjectPrx::operator<(const ObjectPrx& r) const
 {
-    if(b)
+    return _reference < r._reference;
+}
+
+bool
+Ice::ObjectPrx::ice_isA(const string& typeId, const ::Ice::Context& context)
+{
+    promise<bool> p;
+    ice_isA_async(typeId,
+        [&](bool value)
+        {
+            p.set_value(value);
+        },
+        [&](exception_ptr ex)
+        {
+            p.set_exception(move(ex));
+        },
+        nullptr, context);
+    return p.get_future().get();
+}
+
+function<void()>
+Ice::ObjectPrx::ice_isA_async(const string& typeId,
+                              function<void (bool)> response,
+                              function<void (exception_ptr)> exception,
+                              function<void (bool)> sent,
+                              const ::Ice::Context& context)
+{
+    return TwowayClosureCallback::invoke(ice_isA_name, shared_from_this(), OperationMode::Nonmutating, DefaultFormat,
+        [&typeId](IceInternal::BasicStream* os)
+        {
+            os->write(typeId);
+        },
+        false,
+        [response = move(response)](IceInternal::BasicStream* is)
+        {
+            bool ret;
+            is->read(ret);
+            is->endReadEncaps();
+            if(response)
+            {
+                response(ret);
+            }
+        },
+        nullptr, move(exception), move(sent), context);
+}
+
+void
+Ice::ObjectPrx::ice_ping(const ::Ice::Context& context)
+{
+    switch(_reference->getMode())
     {
-        ObjectPrx bb = b->ice_facet(f);
+        case Reference::ModeTwoway:
+        {
+            promise<void> p;
+            ice_ping_async(
+                [&]()
+                {
+                    p.set_value();
+                },
+                [&](exception_ptr ex)
+                {
+                    p.set_exception(move(ex));
+                },
+                nullptr, context);
+            p.get_future().get();
+            break;
+        }
+        case Reference::ModeOneway:
+        case Reference::ModeDatagram:
+        {
+            promise<void> p;
+            ice_ping_async(
+                nullptr,
+                [&](exception_ptr ex)
+                {
+                    p.set_exception(move(ex));
+                },
+                [&](bool)
+                {
+                    p.set_value();
+                },
+                context);
+            p.get_future().get();
+            break;
+        }
+        case Reference::ModeBatchOneway:
+        case Reference::ModeBatchDatagram:
+        {
+            ice_ping_async(nullptr, nullptr, nullptr, context);
+        }
+    }
+}
+
+function<void()>
+Ice::ObjectPrx::ice_ping_async(function<void ()> response,
+                               function<void (exception_ptr)> exception,
+                               function<void (bool)> sent,
+                               const ::Ice::Context& context)
+{
+    return OnewayClosureCallback::invoke(ice_ping_name, shared_from_this(), OperationMode::Nonmutating, DefaultFormat,
+                                         nullptr, response, exception, sent, context);
+}
+
+string
+Ice::ObjectPrx::ice_id(const ::Ice::Context& context)
+{
+    promise<string> p;
+    ice_id_async(
+        [&](string id)
+        {
+            p.set_value(move(id));
+        },
+        [&](exception_ptr ex)
+        {
+            p.set_exception(move(ex));
+        },
+        nullptr, context);
+    return p.get_future().get();
+}
+
+function<void()>
+Ice::ObjectPrx::ice_id_async(function<void (string)> response,
+                             function<void (exception_ptr)> exception,
+                             function<void (bool)> sent,
+                             const ::Ice::Context& context)
+{
+    return TwowayClosureCallback::invoke(
+        ice_id_name, shared_from_this(), OperationMode::Nonmutating, DefaultFormat, nullptr, false,
+        [response](IceInternal::BasicStream* is)
+        {
+            string ret;
+            is->read(ret);
+            is->endReadEncaps();
+            if(response)
+            {
+                response(move(ret));
+            }
+        },
+        nullptr, exception, sent, context);
+}
+
+
+vector<string>
+Ice::ObjectPrx::ice_ids(const ::Ice::Context& context)
+{
+    promise<vector<string>> p;
+    ice_ids_async(
+        [&](vector<string> ids)
+        {
+            p.set_value(move(ids));
+        },
+        [&](exception_ptr ex)
+        {
+            p.set_exception(move(ex));
+        },
+        nullptr, context);
+    return p.get_future().get();
+}
+
+function<void()>
+Ice::ObjectPrx::ice_ids_async(function<void (vector<string>)> response,
+                              function<void (exception_ptr)> exception,
+                              function<void (bool)> sent,
+                              const ::Ice::Context& context)
+{
+    return TwowayClosureCallback::invoke(
+        ice_ids_name, shared_from_this(), OperationMode::Nonmutating, DefaultFormat, nullptr, false,
+        [response](IceInternal::BasicStream* is)
+        {
+            vector<string> ret;
+            is->read(ret);
+            is->endReadEncaps();
+            if(response)
+            {
+                response(move(ret));
+            }
+        },
+        nullptr, exception, sent, context);
+}
+
+function<void ()>
+Ice::ObjectPrx::ice_getConnection_async(
+    function<void (shared_ptr<::Ice::Connection>)> response,
+    function<void (exception_ptr)> exception)
+{
+
+    class ConnectionCallback : public CallbackBase
+    {
+    public:
+
+        ConnectionCallback(function<void (shared_ptr<::Ice::Connection>)> response,
+                           function<void (exception_ptr)> exception,
+                           shared_ptr<ObjectPrx> proxy) :
+            _response(move(response)),
+            _exception(move(exception)),
+            _proxy(move(proxy))
+        {
+        }
+
+        virtual void sent(const AsyncResultPtr&) const {}
+
+        virtual bool hasSentCallback() const
+        {
+            return false;
+        }
+
+
+        virtual void
+        completed(const ::Ice::AsyncResultPtr& result) const
+        {
+            shared_ptr<::Ice::Connection> conn;
+            try
+            {
+                AsyncResult::__check(result, _proxy.get(), ice_getConnection_name);
+                result->__wait();
+                conn = _proxy->ice_getCachedConnection();
+            }
+            catch(const ::Ice::Exception&)
+            {
+                _exception(current_exception());
+            }
+
+            if(_response)
+            {
+                _response(move(conn));
+            }
+        }
+
+    private:
+
+        function<void (shared_ptr<::Ice::Connection>)> _response;
+        function<void (exception_ptr)> _exception;
+        shared_ptr<ObjectPrx> _proxy;
+    };
+
+
+    auto result = make_shared<ProxyGetConnection>(shared_from_this(), ice_getConnection_name,
+        make_shared<ConnectionCallback>(move(response), move(exception), shared_from_this()));
+    try
+    {
+        result->invoke();
+    }
+    catch(const Exception& ex)
+    {
+        result->abort(ex);
+    }
+
+    return [result]()
+        {
+            result->cancel();
+        };
+}
+
+void
+Ice::ObjectPrx::ice_flushBatchRequests()
+{
+    promise<void> p;
+    ice_flushBatchRequests_async(
+        [&](exception_ptr ex)
+        {
+            p.set_exception(ex);
+        },
+        [&](bool)
+        {
+            p.set_value();
+        });
+    p.get_future().get();
+}
+
+function<void ()>
+Ice::ObjectPrx::ice_flushBatchRequests_async(function<void (exception_ptr)> exception, function<void (bool)> sent)
+{
+    class FlushBatchRequestsCallback : public CallbackBase
+    {
+    public:
+
+        FlushBatchRequestsCallback(function<void (exception_ptr)> exception,
+                                   function<void (bool)> sent,
+                                   shared_ptr<ObjectPrx> proxy) :
+            _exception(move(exception)),
+            _sent(move(sent)),
+            _proxy(move(proxy))
+        {
+        }
+
+        virtual void sent(const AsyncResultPtr& result) const
+        {
+            try
+            {
+                AsyncResult::__check(result, _proxy.get(), ice_flushBatchRequests_name);
+                result->__wait();
+            }
+            catch(const ::Ice::Exception&)
+            {
+                _exception(current_exception());
+            }
+
+            if(_sent)
+            {
+                _sent(result->sentSynchronously());
+            }
+        }
+
+        virtual bool hasSentCallback() const
+        {
+            return true;
+        }
+
+
+        virtual void
+        completed(const ::Ice::AsyncResultPtr&) const
+        {
+        }
+
+    private:
+
+        function<void (exception_ptr)> _exception;
+        function<void (bool)> _sent;
+        shared_ptr<ObjectPrx> _proxy;
+    };
+
+    auto result = make_shared<ProxyFlushBatchAsync>(shared_from_this(), ice_flushBatchRequests_name,
+                                        make_shared<FlushBatchRequestsCallback>(exception, sent, shared_from_this()));
+    try
+    {
+        result->invoke();
+    }
+    catch(const Exception& ex)
+    {
+        result->abort(ex);
+    }
+    return [result]()
+        {
+            result->cancel();
+        };
+}
+
+bool
+Ice::ObjectPrx::ice_invoke(const string& operation,
+                           ::Ice::OperationMode mode,
+                           const vector<::Ice::Byte>& inParams,
+                           vector<::Ice::Byte>& pOutParams,
+                           const ::Ice::Context& context)
+{
+    promise<bool> p;
+    ice_invoke_async(operation, mode, inParams,
+        [&](bool ok, vector<::Ice::Byte> outParams)
+        {
+            pOutParams = move(outParams);
+            p.set_value(ok);
+        },
+        [&](exception_ptr ex)
+        {
+            p.set_exception(move(ex));
+        },
+        nullptr, context);
+    return p.get_future().get();
+}
+
+function<void ()>
+Ice::ObjectPrx::ice_invoke_async(const string& operation, ::Ice::OperationMode mode,
+    const vector<::Ice::Byte>& inEncaps,
+    function<void (bool, vector<::Ice::Byte>)> response,
+    function<void (exception_ptr)> exception,
+    function<void (bool)> sent,
+    const ::Ice::Context& context)
+{
+    class InvokeCallback : public CallbackBase
+    {
+    public:
+
+        InvokeCallback(function<void (bool, vector<::Ice::Byte>)> response,
+                       function<void (exception_ptr)> exception,
+                       shared_ptr<ObjectPrx> proxy) :
+            _response(move(response)),
+            _exception(move(exception)),
+            _proxy(move(proxy))
+        {
+        }
+
+        virtual void sent(const AsyncResultPtr&) const {}
+
+        virtual bool hasSentCallback() const
+        {
+            return false;
+        }
+
+
+        virtual void
+        completed(const ::Ice::AsyncResultPtr& result) const
+        {
+            try
+            {
+                AsyncResult::__check(result, _proxy.get(), ice_invoke_name);
+                bool ok = result->__wait();
+                if(_proxy->_reference->getMode() == Reference::ModeTwoway)
+                {
+                    const Byte* v;
+                    Int sz;
+                    result->__readParamEncaps(v, sz);
+                    if(_response)
+                    {
+                        _response(ok, vector<Byte>(v, v + sz));
+                    }
+                }
+            }
+            catch(const ::Ice::Exception&)
+            {
+                _exception(current_exception());
+            }
+        }
+
+    private:
+
+        function<void (bool, vector<::Ice::Byte>)> _response;
+        function<void (exception_ptr)> _exception;
+        shared_ptr<ObjectPrx> _proxy;
+    };
+
+    auto result = make_shared<OutgoingAsync>(shared_from_this(), ice_invoke_name,
+        make_shared<InvokeCallback>(move(response), move(exception), shared_from_this()));
+    try
+    {
+        result->prepare(operation, mode, &context);
+
+        pair<const Byte*, const Byte*> inPair;
+        if(inEncaps.empty())
+        {
+            inPair.first = inPair.second = 0;
+        }
+        else
+        {
+            inPair.first = &inEncaps[0];
+            inPair.second = inPair.first + inEncaps.size();
+        }
+
+        result->writeParamEncaps(&inEncaps[0], static_cast<Int>(inPair.second - inPair.first));
+        result->invoke();
+    }
+    catch(const Exception& ex)
+    {
+        result->abort(ex);
+    }
+
+    return [result]()
+        {
+            result->cancel();
+        };
+}
+
+shared_ptr<ObjectPrx>
+Ice::ObjectPrx::__newInstance() const
+{
+    return make_shared<ObjectPrx>();
+}
+
+#else // C++98 mapping
+
+::Ice::ObjectPrxPtr
+IceInternal::checkedCastImpl(const ObjectPrxPtr& b, const string& f, const string& typeId, const Context* context)
+{
+    if(b != ICE_NULLPTR)
+    {
+        ObjectPrxPtr bb = b->ice_facet(f);
         try
         {
             if(context == 0 ? bb->ice_isA(typeId) : bb->ice_isA(typeId, *context))
@@ -65,10 +545,10 @@ IceInternal::checkedCastImpl(const ObjectPrx& b, const string& f, const string&
         {
         }
     }
-    return 0;
+    return ICE_NULLPTR;
 }
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
 
 IceInternal::Cpp11FnCallbackNC::Cpp11FnCallbackNC(const ::std::function<void (const ::Ice::Exception&)>& excb,
                                                   const ::std::function<void (bool)>& sentcb) :
@@ -153,24 +633,6 @@ IceProxy::Ice::Object::operator<(const Object& r) const
     return _reference < r._reference;
 }
 
-CommunicatorPtr
-IceProxy::Ice::Object::ice_getCommunicator() const
-{
-    return _reference->getCommunicator();
-}
-
-string
-IceProxy::Ice::Object::ice_toString() const
-{
-    //
-    // Returns the stringified proxy. There's no need to convert the
-    // string to a native string: a stringified proxy only contains
-    // printable ASCII which is a subset of all native character sets.
-    //
-    return _reference->toString();
-}
-
-
 bool
 IceProxy::Ice::Object::ice_isA(const string& typeId, const Context* context)
 {
@@ -227,7 +689,7 @@ IceProxy::Ice::Object::begin_ice_isA(const string& typeId,
     return __result;
 }
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
 
 Ice::AsyncResultPtr
 IceProxy::Ice::Object::__begin_ice_isA(const ::std::string& typeId,
@@ -838,14 +1300,199 @@ IceProxy::Ice::Object::___end_ice_invoke(pair<const Byte*, const Byte*>& outEnca
     return ok;
 }
 
+::Ice::AsyncResultPtr
+IceProxy::Ice::Object::begin_ice_flushBatchRequestsInternal(const ::IceInternal::CallbackBasePtr& del,
+                                                            const ::Ice::LocalObjectPtr& cookie)
+{
+    ProxyFlushBatchAsyncPtr result = new ProxyFlushBatchAsync(this, ice_flushBatchRequests_name, del, cookie);
+    try
+    {
+        result->invoke();
+    }
+    catch(const Exception& ex)
+    {
+        result->abort(ex);
+    }
+    return result;
+}
+
+void
+IceProxy::Ice::Object::end_ice_flushBatchRequests(const AsyncResultPtr& result)
+{
+    AsyncResult::__check(result, this, ice_flushBatchRequests_name);
+    result->__wait();
+}
+
+Int
+IceProxy::Ice::Object::__hash() const
+{
+    return _reference->hash();
+}
+
+void
+IceProxy::Ice::Object::__invoke(Outgoing& __og) const
+{
+    //
+    // Helper for operations without out/return parameters and user
+    // exceptions.
+    //
+
+    bool __ok = __og.invoke();
+    if(__og.hasResponse())
+    {
+        if(!__ok)
+        {
+            try
+            {
+                __og.throwUserException();
+            }
+            catch(const ::Ice::UserException& __ex)
+            {
+                ::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());
+                throw __uue;
+            }
+        }
+        __og.readEmptyParams();
+    }
+}
+
+void
+IceProxy::Ice::Object::__end(const ::Ice::AsyncResultPtr& __result, const std::string& operation) const
+{
+    AsyncResult::__check(__result, this, operation);
+    bool __ok = __result->__wait();
+    if(_reference->getMode() == Reference::ModeTwoway)
+    {
+        if(!__ok)
+        {
+            try
+            {
+                __result->__throwUserException();
+            }
+            catch(const UserException& __ex)
+            {
+                throw UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
+            }
+        }
+        __result->__readEmptyParams();
+    }
+}
+
+namespace IceProxy
+{
+
+namespace Ice
+{
+
+ostream&
+operator<<(ostream& os, const ::IceProxy::Ice::Object& p)
+{
+    return os << p.ice_toString();
+}
+
+}
+
+}
+
+IceProxy::Ice::Object*
+IceProxy::Ice::Object::__newInstance() const
+{
+    return new Object;
+}
+
+AsyncResultPtr
+IceProxy::Ice::Object::begin_ice_getConnectionInternal(const ::IceInternal::CallbackBasePtr& del,
+                                                       const ::Ice::LocalObjectPtr& cookie)
+{
+    ProxyGetConnectionPtr result = new ProxyGetConnection(this, ice_getConnection_name, del, cookie);
+    try
+    {
+        result->invoke();
+    }
+    catch(const Exception& ex)
+    {
+        result->abort(ex);
+    }
+    return result;
+}
+
+ConnectionPtr
+IceProxy::Ice::Object::end_ice_getConnection(const AsyncResultPtr& __result)
+{
+    AsyncResult::__check(__result, this, ice_getConnection_name);
+    __result->__wait();
+    return ice_getCachedConnection();
+}
+
+void
+IceProxy::Ice::Object::ice_flushBatchRequests()
+{
+    ProxyFlushBatch og(ICE_SHARED_FROM_THIS, ice_flushBatchRequests_name);
+    og.invoke();
+}
+
+void
+IceProxy::Ice::Object::__checkTwowayOnly(const string& name) const
+{
+    //
+    // No mutex lock necessary, there is nothing mutable in this operation.
+    //
+    if(!ice_isTwoway())
+    {
+        TwowayOnlyException ex(__FILE__, __LINE__);
+        ex.operation = name;
+        throw ex;
+    }
+}
+
+void
+Ice::ice_writeObjectPrx(const OutputStreamPtr& out, const ObjectPrxPtr& v)
+{
+    out->write(v);
+}
+
+void
+Ice::ice_readObjectPrx(const InputStreamPtr& in, ObjectPrxPtr& v)
+{
+    in->read(v);
+}
+
+#endif
+
+#ifdef ICE_CPP11_MAPPING
+#  define ICE_OBJECT_PRX Ice::ObjectPrx
+#  define CONST_POINTER_CAST_OBJECT_PRX const_pointer_cast<ObjectPrx>(shared_from_this())
+#else
+#  define ICE_OBJECT_PRX IceProxy::Ice::Object
+#  define CONST_POINTER_CAST_OBJECT_PRX ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this))
+#endif
+
+//
+// methods common for both C++11/C++98 mappings
+//
+
+void
+ICE_OBJECT_PRX::__checkAsyncTwowayOnly(const string& name) const
+{
+    //
+    // No mutex lock necessary, there is nothing mutable in this operation.
+    //
+    if(!ice_isTwoway())
+    {
+        throw IceUtil::IllegalArgumentException(__FILE__,
+                                                __LINE__,
+                                                "`" + name + "' can only be called with a twoway proxy");
+    }
+}
+
 Identity
-IceProxy::Ice::Object::ice_getIdentity() const
+ICE_OBJECT_PRX::ice_getIdentity() const
 {
     return _reference->getIdentity();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_identity(const Identity& newIdentity) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_identity(const Identity& newIdentity) const
 {
     if(newIdentity.name.empty())
     {
@@ -853,113 +1500,121 @@ IceProxy::Ice::Object::ice_identity(const Identity& newIdentity) const
     }
     if(newIdentity == _reference->getIdentity())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = new Object;
+#ifdef ICE_CPP11_MAPPING
+        auto proxy = make_shared<ObjectPrx>();
+#else
+        ObjectPrxPtr proxy = new IceProxy::Ice::Object;
+#endif
         proxy->setup(_reference->changeIdentity(newIdentity));
         return proxy;
     }
 }
 
 Context
-IceProxy::Ice::Object::ice_getContext() const
+ICE_OBJECT_PRX::ice_getContext() const
 {
     return _reference->getContext()->getValue();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_context(const Context& newContext) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_context(const Context& newContext) const
 {
-    ObjectPrx proxy = __newInstance();
+    ObjectPrxPtr proxy = __newInstance();
     proxy->setup(_reference->changeContext(newContext));
     return proxy;
 }
 
 const string&
-IceProxy::Ice::Object::ice_getFacet() const
+ICE_OBJECT_PRX::ice_getFacet() const
 {
     return _reference->getFacet();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_facet(const string& newFacet) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_facet(const string& newFacet) const
 {
     if(newFacet == _reference->getFacet())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = new Object;
+#ifdef ICE_CPP11_MAPPING
+        auto proxy = make_shared<ObjectPrx>();
+#else
+        ObjectPrx proxy = new IceProxy::Ice::Object;
+#endif
         proxy->setup(_reference->changeFacet(newFacet));
         return proxy;
     }
 }
 
 string
-IceProxy::Ice::Object::ice_getAdapterId() const
+ICE_OBJECT_PRX::ice_getAdapterId() const
 {
     return _reference->getAdapterId();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_adapterId(const string& newAdapterId) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_adapterId(const string& newAdapterId) const
 {
     if(newAdapterId == _reference->getAdapterId())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeAdapterId(newAdapterId));
         return proxy;
     }
 }
 
 EndpointSeq
-IceProxy::Ice::Object::ice_getEndpoints() const
+ICE_OBJECT_PRX::ice_getEndpoints() const
 {
     vector<EndpointIPtr> endpoints = _reference->getEndpoints();
     EndpointSeq retSeq;
     for(vector<EndpointIPtr>::const_iterator p = endpoints.begin(); p != endpoints.end(); ++p)
     {
-        retSeq.push_back(EndpointPtr::dynamicCast(*p));
+        retSeq.push_back(ICE_DYNAMIC_CAST(Endpoint, *p));
     }
     return retSeq;
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_endpoints(const EndpointSeq& newEndpoints) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_endpoints(const EndpointSeq& newEndpoints) const
 {
     vector<EndpointIPtr> endpoints;
     for(EndpointSeq::const_iterator p = newEndpoints.begin(); p != newEndpoints.end(); ++p)
     {
-        endpoints.push_back(EndpointIPtr::dynamicCast(*p));
+        endpoints.push_back(ICE_DYNAMIC_CAST(EndpointI, *p));
     }
 
     if(endpoints == _reference->getEndpoints())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeEndpoints(endpoints));
         return proxy;
     }
 }
 
 Int
-IceProxy::Ice::Object::ice_getLocatorCacheTimeout() const
+ICE_OBJECT_PRX::ice_getLocatorCacheTimeout() const
 {
     return _reference->getLocatorCacheTimeout();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_locatorCacheTimeout(Int newTimeout) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_locatorCacheTimeout(Int newTimeout) const
 {
     if(newTimeout < -1)
     {
@@ -969,196 +1624,204 @@ IceProxy::Ice::Object::ice_locatorCacheTimeout(Int newTimeout) const
     }
     if(newTimeout == _reference->getLocatorCacheTimeout())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeLocatorCacheTimeout(newTimeout));
         return proxy;
     }
 }
 
 bool
-IceProxy::Ice::Object::ice_isConnectionCached() const
+ICE_OBJECT_PRX::ice_isConnectionCached() const
 {
     return _reference->getCacheConnection();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_connectionCached(bool newCache) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_connectionCached(bool newCache) const
 {
     if(newCache == _reference->getCacheConnection())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeCacheConnection(newCache));
         return proxy;
     }
 }
 
 EndpointSelectionType
-IceProxy::Ice::Object::ice_getEndpointSelection() const
+ICE_OBJECT_PRX::ice_getEndpointSelection() const
 {
     return _reference->getEndpointSelection();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_endpointSelection(EndpointSelectionType newType) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_endpointSelection(EndpointSelectionType newType) const
 {
     if(newType == _reference->getEndpointSelection())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeEndpointSelection(newType));
         return proxy;
     }
 }
 
 bool
-IceProxy::Ice::Object::ice_isSecure() const
+ICE_OBJECT_PRX::ice_isSecure() const
 {
     return _reference->getSecure();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_secure(bool b) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_secure(bool b) const
 {
     if(b == _reference->getSecure())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeSecure(b));
         return proxy;
     }
 }
 
 ::Ice::EncodingVersion
-IceProxy::Ice::Object::ice_getEncodingVersion() const
+ICE_OBJECT_PRX::ice_getEncodingVersion() const
 {
     return _reference->getEncoding();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_encodingVersion(const ::Ice::EncodingVersion& encoding) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_encodingVersion(const ::Ice::EncodingVersion& encoding) const
 {
     if(encoding == _reference->getEncoding())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeEncoding(encoding));
         return proxy;
     }
 }
 
 bool
-IceProxy::Ice::Object::ice_isPreferSecure() const
+ICE_OBJECT_PRX::ice_isPreferSecure() const
 {
     return _reference->getPreferSecure();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_preferSecure(bool b) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_preferSecure(bool b) const
 {
     if(b == _reference->getPreferSecure())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changePreferSecure(b));
         return proxy;
     }
 }
 
-RouterPrx
-IceProxy::Ice::Object::ice_getRouter() const
+RouterPrxPtr
+ICE_OBJECT_PRX::ice_getRouter() const
 {
     RouterInfoPtr ri = _reference->getRouterInfo();
-    return ri ? ri->getRouter() : RouterPrx();
+#ifdef ICE_CPP11_MAPPING
+    return ri ? ri->getRouter() : nullptr;
+#else
+    return ri ? ri->getRouter() : RouterPrxPtr();
+#endif
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_router(const RouterPrx& router) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_router(const RouterPrxPtr& router) const
 {
     ReferencePtr ref = _reference->changeRouter(router);
     if(ref == _reference)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(ref);
         return proxy;
     }
 }
 
-LocatorPrx
-IceProxy::Ice::Object::ice_getLocator() const
+LocatorPrxPtr
+ICE_OBJECT_PRX::ice_getLocator() const
 {
     LocatorInfoPtr ri = _reference->getLocatorInfo();
-    return ri ? ri->getLocator() : LocatorPrx();
+#ifdef ICE_CPP11_MAPPING
+    return ri ? ri->getLocator() : nullptr;
+#else
+    return ri ? ri->getLocator() : LocatorPrxPtr();
+#endif
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_locator(const LocatorPrx& locator) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_locator(const LocatorPrxPtr& locator) const
 {
     ReferencePtr ref = _reference->changeLocator(locator);
     if(ref == _reference)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(ref);
         return proxy;
     }
 }
 
 bool
-IceProxy::Ice::Object::ice_isCollocationOptimized() const
+ICE_OBJECT_PRX::ice_isCollocationOptimized() const
 {
     return _reference->getCollocationOptimized();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_collocationOptimized(bool b) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_collocationOptimized(bool b) const
 {
     if(b == _reference->getCollocationOptimized())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeCollocationOptimized(b));
         return proxy;
     }
 }
 
 Int
-IceProxy::Ice::Object::ice_getInvocationTimeout() const
+ICE_OBJECT_PRX::ice_getInvocationTimeout() const
 {
     return _reference->getInvocationTimeout();
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_invocationTimeout(Int newTimeout) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_invocationTimeout(Int newTimeout) const
 {
     if(newTimeout < 1 && newTimeout != -1 && newTimeout != -2)
     {
@@ -1168,139 +1831,139 @@ IceProxy::Ice::Object::ice_invocationTimeout(Int newTimeout) const
     }
     if(newTimeout == _reference->getInvocationTimeout())
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeInvocationTimeout(newTimeout));
         return proxy;
     }
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_twoway() const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_twoway() const
 {
     if(_reference->getMode() == Reference::ModeTwoway)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeMode(Reference::ModeTwoway));
         return proxy;
     }
 }
 
 bool
-IceProxy::Ice::Object::ice_isTwoway() const
+ICE_OBJECT_PRX::ice_isTwoway() const
 {
     return _reference->getMode() == Reference::ModeTwoway;
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_oneway() const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_oneway() const
 {
     if(_reference->getMode() == Reference::ModeOneway)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeMode(Reference::ModeOneway));
         return proxy;
     }
 }
 
 bool
-IceProxy::Ice::Object::ice_isOneway() const
+ICE_OBJECT_PRX::ice_isOneway() const
 {
     return _reference->getMode() == Reference::ModeOneway;
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_batchOneway() const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_batchOneway() const
 {
     if(_reference->getMode() == Reference::ModeBatchOneway)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeMode(Reference::ModeBatchOneway));
         return proxy;
     }
 }
 
 bool
-IceProxy::Ice::Object::ice_isBatchOneway() const
+ICE_OBJECT_PRX::ice_isBatchOneway() const
 {
     return _reference->getMode() == Reference::ModeBatchOneway;
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_datagram() const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_datagram() const
 {
     if(_reference->getMode() == Reference::ModeDatagram)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeMode(Reference::ModeDatagram));
         return proxy;
     }
 }
 
 bool
-IceProxy::Ice::Object::ice_isDatagram() const
+ICE_OBJECT_PRX::ice_isDatagram() const
 {
     return _reference->getMode() == Reference::ModeDatagram;
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_batchDatagram() const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_batchDatagram() const
 {
     if(_reference->getMode() == Reference::ModeBatchDatagram)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(_reference->changeMode(Reference::ModeBatchDatagram));
         return proxy;
     }
 }
 
 bool
-IceProxy::Ice::Object::ice_isBatchDatagram() const
+ICE_OBJECT_PRX::ice_isBatchDatagram() const
 {
     return _reference->getMode() == Reference::ModeBatchDatagram;
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_compress(bool b) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_compress(bool b) const
 {
     ReferencePtr ref = _reference->changeCompress(b);
     if(ref == _reference)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(ref);
         return proxy;
     }
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_timeout(int t) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_timeout(int t) const
 {
     if(t < 1 && t != -1)
     {
@@ -1311,42 +1974,42 @@ IceProxy::Ice::Object::ice_timeout(int t) const
     ReferencePtr ref = _reference->changeTimeout(t);
     if(ref == _reference)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(ref);
         return proxy;
     }
 }
 
-ObjectPrx
-IceProxy::Ice::Object::ice_connectionId(const string& id) const
+ObjectPrxPtr
+ICE_OBJECT_PRX::ice_connectionId(const string& id) const
 {
     ReferencePtr ref = _reference->changeConnectionId(id);
     if(ref == _reference)
     {
-        return ObjectPrx(const_cast< ::IceProxy::Ice::Object*>(this));
+        return CONST_POINTER_CAST_OBJECT_PRX;
     }
     else
     {
-        ObjectPrx proxy = __newInstance();
+        ObjectPrxPtr proxy = __newInstance();
         proxy->setup(ref);
         return proxy;
     }
 }
 
 string
-IceProxy::Ice::Object::ice_getConnectionId() const
+ICE_OBJECT_PRX::ice_getConnectionId() const
 {
     return _reference->getConnectionId();
 }
 
 ConnectionPtr
-IceProxy::Ice::Object::ice_getConnection()
+ICE_OBJECT_PRX::ice_getConnection()
 {
-    InvocationObserver observer(this, "ice_getConnection", 0);
+    InvocationObserver observer(ICE_SHARED_FROM_THIS, "ice_getConnection", 0);
     int cnt = 0;
     while(true)
     {
@@ -1364,7 +2027,7 @@ IceProxy::Ice::Object::ice_getConnection()
         {
             try
             {
-                int interval = __handleException(ex, handler, Idempotent, false, cnt);
+                int interval = __handleException(ex, handler, ICE_ENUM(OperationMode, Idempotent), false, cnt);
                 observer.retried();
                 if(interval > 0)
                 {
@@ -1380,32 +2043,8 @@ IceProxy::Ice::Object::ice_getConnection()
     }
 }
 
-AsyncResultPtr
-IceProxy::Ice::Object::begin_ice_getConnectionInternal(const ::IceInternal::CallbackBasePtr& del,
-                                                       const ::Ice::LocalObjectPtr& cookie)
-{
-    ProxyGetConnectionPtr result = new ProxyGetConnection(this, ice_getConnection_name, del, cookie);
-    try
-    {
-        result->invoke();
-    }
-    catch(const Exception& ex)
-    {
-        result->abort(ex);
-    }
-    return result;
-}
-
-ConnectionPtr
-IceProxy::Ice::Object::end_ice_getConnection(const AsyncResultPtr& __result)
-{
-    AsyncResult::__check(__result, this, ice_getConnection_name);
-    __result->__wait();
-    return ice_getCachedConnection();
-}
-
 ConnectionPtr
-IceProxy::Ice::Object::ice_getCachedConnection() const
+ICE_OBJECT_PRX::ice_getCachedConnection() const
 {
     RequestHandlerPtr __handler;
     {
@@ -1427,51 +2066,21 @@ IceProxy::Ice::Object::ice_getCachedConnection() const
 }
 
 void
-IceProxy::Ice::Object::ice_flushBatchRequests()
-{
-    ProxyFlushBatch og(this, ice_flushBatchRequests_name);
-    og.invoke();
-}
-
-::Ice::AsyncResultPtr
-IceProxy::Ice::Object::begin_ice_flushBatchRequestsInternal(const ::IceInternal::CallbackBasePtr& del,
-                                                            const ::Ice::LocalObjectPtr& cookie)
-{
-    ProxyFlushBatchAsyncPtr result = new ProxyFlushBatchAsync(this, ice_flushBatchRequests_name, del, cookie);
-    try
-    {
-        result->invoke();
-    }
-    catch(const Exception& ex)
-    {
-        result->abort(ex);
-    }
-    return result;
-}
-
-void
-IceProxy::Ice::Object::end_ice_flushBatchRequests(const AsyncResultPtr& result)
+ICE_OBJECT_PRX::setup(const ReferencePtr& ref)
 {
-    AsyncResult::__check(result, this, ice_flushBatchRequests_name);
-    result->__wait();
-}
+    //
+    // No need to synchronize "*this", as this operation is only
+    // called upon initialization.
+    //
 
-Int
-IceProxy::Ice::Object::__hash() const
-{
-    return _reference->hash();
-}
+    assert(!_reference);
+    assert(!_requestHandler);
 
-void
-IceProxy::Ice::Object::__copyFrom(const ObjectPrx& from)
-{
-    IceUtil::Mutex::Lock sync(from->_mutex);
-    _reference = from->_reference;
-    _requestHandler = from->_requestHandler;
+    _reference = ref;
 }
 
 int
-IceProxy::Ice::Object::__handleException(const Exception& ex,
+ICE_OBJECT_PRX::__handleException(const Exception& ex,
                                          const RequestHandlerPtr& handler,
                                          OperationMode mode,
                                          bool sent,
@@ -1496,7 +2105,7 @@ IceProxy::Ice::Object::__handleException(const Exception& ex,
     //
     const LocalException* localEx = dynamic_cast<const LocalException*>(&ex);
     if(localEx && (!sent ||
-                   mode == Nonmutating || mode == Idempotent ||
+                   mode == ICE_ENUM(OperationMode, Nonmutating) || mode == ICE_ENUM(OperationMode, Idempotent) ||
                    dynamic_cast<const CloseConnectionException*>(&ex) ||
                    dynamic_cast<const ObjectNotExistException*>(&ex)))
     {
@@ -1519,101 +2128,8 @@ IceProxy::Ice::Object::__handleException(const Exception& ex,
     return 0; // Keep the compiler happy.
 }
 
-void
-IceProxy::Ice::Object::__checkTwowayOnly(const string& name) const
-{
-    //
-    // No mutex lock necessary, there is nothing mutable in this operation.
-    //
-    if(!ice_isTwoway())
-    {
-        TwowayOnlyException ex(__FILE__, __LINE__);
-        ex.operation = name;
-        throw ex;
-    }
-}
-
-void
-IceProxy::Ice::Object::__checkAsyncTwowayOnly(const string& name) const
-{
-    //
-    // No mutex lock necessary, there is nothing mutable in this operation.
-    //
-    if(!ice_isTwoway())
-    {
-        throw IceUtil::IllegalArgumentException(__FILE__,
-                                                __LINE__,
-                                                "`" + name + "' can only be called with a twoway proxy");
-    }
-}
-
-void
-IceProxy::Ice::Object::__invoke(Outgoing& __og) const
-{
-    //
-    // Helper for operations without out/return parameters and user
-    // exceptions.
-    //
-
-    bool __ok = __og.invoke();
-    if(__og.hasResponse())
-    {
-        if(!__ok)
-        {
-            try
-            {
-                __og.throwUserException();
-            }
-            catch(const ::Ice::UserException& __ex)
-            {
-                ::Ice::UnknownUserException __uue(__FILE__, __LINE__, __ex.ice_name());
-                throw __uue;
-            }
-        }
-        __og.readEmptyParams();
-    }
-}
-
-void
-IceProxy::Ice::Object::__end(const ::Ice::AsyncResultPtr& __result, const std::string& operation) const
-{
-    AsyncResult::__check(__result, this, operation);
-    bool __ok = __result->__wait();
-    if(_reference->getMode() == Reference::ModeTwoway)
-    {
-        if(!__ok)
-        {
-            try
-            {
-                __result->__throwUserException();
-            }
-            catch(const UserException& __ex)
-            {
-                throw UnknownUserException(__FILE__, __LINE__, __ex.ice_name());
-            }
-        }
-        __result->__readEmptyParams();
-    }
-}
-
-namespace IceProxy
-{
-
-namespace Ice
-{
-
-ostream&
-operator<<(ostream& os, const ::IceProxy::Ice::Object& p)
-{
-    return os << p.ice_toString();
-}
-
-}
-
-}
-
 ::IceInternal::RequestHandlerPtr
-IceProxy::Ice::Object::__getRequestHandler()
+ICE_OBJECT_PRX::__getRequestHandler()
 {
     RequestHandlerPtr handler;
     if(_reference->getCacheConnection())
@@ -1624,11 +2140,11 @@ IceProxy::Ice::Object::__getRequestHandler()
             return _requestHandler;
         }
     }
-    return _reference->getRequestHandler(this);
+    return _reference->getRequestHandler(ICE_SHARED_FROM_THIS);
 }
 
 IceInternal::BatchRequestQueuePtr
-IceProxy::Ice::Object::__getBatchRequestQueue()
+ICE_OBJECT_PRX::__getBatchRequestQueue()
 {
     IceUtil::Mutex::Lock sync(_mutex);
     if(!_batchRequestQueue)
@@ -1639,7 +2155,7 @@ IceProxy::Ice::Object::__getBatchRequestQueue()
 }
 
 ::IceInternal::RequestHandlerPtr
-IceProxy::Ice::Object::__setRequestHandler(const ::IceInternal::RequestHandlerPtr& handler)
+ICE_OBJECT_PRX::__setRequestHandler(const ::IceInternal::RequestHandlerPtr& handler)
 {
     if(_reference->getCacheConnection())
     {
@@ -1654,7 +2170,7 @@ IceProxy::Ice::Object::__setRequestHandler(const ::IceInternal::RequestHandlerPt
 }
 
 void
-IceProxy::Ice::Object::__updateRequestHandler(const ::IceInternal::RequestHandlerPtr& previous,
+ICE_OBJECT_PRX::__updateRequestHandler(const ::IceInternal::RequestHandlerPtr& previous,
                                               const ::IceInternal::RequestHandlerPtr& handler)
 {
     if(_reference->getCacheConnection() && previous)
@@ -1674,28 +2190,33 @@ IceProxy::Ice::Object::__updateRequestHandler(const ::IceInternal::RequestHandle
     }
 }
 
-IceProxy::Ice::Object*
-IceProxy::Ice::Object::__newInstance() const
+void
+ICE_OBJECT_PRX::__copyFrom(const ObjectPrxPtr& from)
 {
-    return new Object;
+    IceUtil::Mutex::Lock sync(from->_mutex);
+    _reference = from->_reference;
+    _requestHandler = from->_requestHandler;
 }
 
-void
-IceProxy::Ice::Object::setup(const ReferencePtr& ref)
+CommunicatorPtr
+ICE_OBJECT_PRX::ice_getCommunicator() const
+{
+    return _reference->getCommunicator();
+}
+
+string
+ICE_OBJECT_PRX::ice_toString() const
 {
     //
-    // No need to synchronize "*this", as this operation is only
-    // called upon initialization.
+    // Returns the stringified proxy. There's no need to convert the
+    // string to a native string: a stringified proxy only contains
+    // printable ASCII which is a subset of all native character sets.
     //
-
-    assert(!_reference);
-    assert(!_requestHandler);
-
-    _reference = ref;
+    return _reference->toString();
 }
 
 bool
-Ice::proxyIdentityLess(const ObjectPrx& lhs, const ObjectPrx& rhs)
+Ice::proxyIdentityLess(const ObjectPrxPtr& lhs, const ObjectPrxPtr& rhs)
 {
     if(!lhs && !rhs)
     {
@@ -1716,7 +2237,7 @@ Ice::proxyIdentityLess(const ObjectPrx& lhs, const ObjectPrx& rhs)
 }
 
 bool
-Ice::proxyIdentityEqual(const ObjectPrx& lhs, const ObjectPrx& rhs)
+Ice::proxyIdentityEqual(const ObjectPrxPtr& lhs, const ObjectPrxPtr& rhs)
 {
     if(!lhs && !rhs)
     {
@@ -1737,7 +2258,7 @@ Ice::proxyIdentityEqual(const ObjectPrx& lhs, const ObjectPrx& rhs)
 }
 
 bool
-Ice::proxyIdentityAndFacetLess(const ObjectPrx& lhs, const ObjectPrx& rhs)
+Ice::proxyIdentityAndFacetLess(const ObjectPrxPtr& lhs, const ObjectPrxPtr& rhs)
 {
     if(!lhs && !rhs)
     {
@@ -1782,7 +2303,7 @@ Ice::proxyIdentityAndFacetLess(const ObjectPrx& lhs, const ObjectPrx& rhs)
 }
 
 bool
-Ice::proxyIdentityAndFacetEqual(const ObjectPrx& lhs, const ObjectPrx& rhs)
+Ice::proxyIdentityAndFacetEqual(const ObjectPrxPtr& lhs, const ObjectPrxPtr& rhs)
 {
     if(!lhs && !rhs)
     {
@@ -1815,15 +2336,3 @@ Ice::proxyIdentityAndFacetEqual(const ObjectPrx& lhs, const ObjectPrx& rhs)
         return false;
     }
 }
-
-void
-Ice::ice_writeObjectPrx(const OutputStreamPtr& out, const ObjectPrx& v)
-{
-    out->write(v);
-}
-
-void
-Ice::ice_readObjectPrx(const InputStreamPtr& in, ObjectPrx& v)
-{
-    in->read(v);
-}
diff --git a/cpp/src/Ice/ProxyFactory.cpp b/cpp/src/Ice/ProxyFactory.cpp
index c5ab91e336c..018cac70602 100644
--- a/cpp/src/Ice/ProxyFactory.cpp
+++ b/cpp/src/Ice/ProxyFactory.cpp
@@ -28,7 +28,7 @@ using namespace IceInternal;
 
 IceUtil::Shared* IceInternal::upCast(ProxyFactory* p) { return p; }
 
-ObjectPrx
+ObjectPrxPtr
 IceInternal::ProxyFactory::stringToProxy(const string& str) const
 {
     ReferencePtr ref = _instance->referenceFactory()->create(str, "");
@@ -36,7 +36,7 @@ IceInternal::ProxyFactory::stringToProxy(const string& str) const
 }
 
 string
-IceInternal::ProxyFactory::proxyToString(const ObjectPrx& proxy) const
+IceInternal::ProxyFactory::proxyToString(const ObjectPrxPtr& proxy) const
 {
     if(proxy)
     {
@@ -48,7 +48,7 @@ IceInternal::ProxyFactory::proxyToString(const ObjectPrx& proxy) const
     }
 }
 
-ObjectPrx
+ObjectPrxPtr
 IceInternal::ProxyFactory::propertyToProxy(const string& prefix) const
 {
     string proxy = _instance->initializationData().properties->getProperty(prefix);
@@ -57,7 +57,7 @@ IceInternal::ProxyFactory::propertyToProxy(const string& prefix) const
 }
 
 PropertyDict
-IceInternal::ProxyFactory::proxyToProperty(const ObjectPrx& proxy, const string& prefix) const
+IceInternal::ProxyFactory::proxyToProperty(const ObjectPrxPtr& proxy, const string& prefix) const
 {
     if(proxy)
     {
@@ -69,7 +69,7 @@ IceInternal::ProxyFactory::proxyToProperty(const ObjectPrx& proxy, const string&
     }
 }
 
-ObjectPrx
+ObjectPrxPtr
 IceInternal::ProxyFactory::streamToProxy(BasicStream* s) const
 {
     Identity ident;
@@ -80,7 +80,7 @@ IceInternal::ProxyFactory::streamToProxy(BasicStream* s) const
 }
 
 void
-IceInternal::ProxyFactory::proxyToStream(const ObjectPrx& proxy, BasicStream* s) const
+IceInternal::ProxyFactory::proxyToStream(const ObjectPrxPtr& proxy, BasicStream* s) const
 {
     if(proxy)
     {
@@ -94,18 +94,18 @@ IceInternal::ProxyFactory::proxyToStream(const ObjectPrx& proxy, BasicStream* s)
     }
 }
 
-ObjectPrx
+ObjectPrxPtr
 IceInternal::ProxyFactory::referenceToProxy(const ReferencePtr& ref) const
 {
     if(ref)
     {
-        ObjectPrx proxy = new ::IceProxy::Ice::Object;
+        ObjectPrxPtr proxy = ICE_MAKE_SHARED(::IceProxy::Ice::Object);
         proxy->setup(ref);
         return proxy;
     }
     else
     {
-        return 0;
+        return ICE_NULLPTR;
     }
 }
 
diff --git a/cpp/src/Ice/ProxyFactory.h b/cpp/src/Ice/ProxyFactory.h
index 72202a446db..18a4ae83552 100644
--- a/cpp/src/Ice/ProxyFactory.h
+++ b/cpp/src/Ice/ProxyFactory.h
@@ -29,16 +29,16 @@ class ProxyFactory : public IceUtil::Shared
 {
 public:
     
-    Ice::ObjectPrx stringToProxy(const std::string&) const;
-    std::string proxyToString(const Ice::ObjectPrx&) const;
+    Ice::ObjectPrxPtr stringToProxy(const std::string&) const;
+    std::string proxyToString(const Ice::ObjectPrxPtr&) const;
 
-    Ice::ObjectPrx propertyToProxy(const std::string&) const;
-    Ice::PropertyDict proxyToProperty(const Ice::ObjectPrx&, const std::string&) const;
+    Ice::ObjectPrxPtr propertyToProxy(const std::string&) const;
+    Ice::PropertyDict proxyToProperty(const Ice::ObjectPrxPtr&, const std::string&) const;
 
-    Ice::ObjectPrx streamToProxy(BasicStream*) const;
-    void proxyToStream(const Ice::ObjectPrx&, BasicStream*) const;
+    Ice::ObjectPrxPtr streamToProxy(BasicStream*) const;
+    void proxyToStream(const Ice::ObjectPrxPtr&, BasicStream*) const;
 
-    Ice::ObjectPrx referenceToProxy(const ReferencePtr&) const;
+    Ice::ObjectPrxPtr referenceToProxy(const ReferencePtr&) const;
 
     int checkRetryAfterException(const Ice::LocalException&, const ReferencePtr&, int&) const;
 
diff --git a/cpp/src/Ice/Reference.cpp b/cpp/src/Ice/Reference.cpp
index c461535c33e..e2b36e92ffa 100644
--- a/cpp/src/Ice/Reference.cpp
+++ b/cpp/src/Ice/Reference.cpp
@@ -27,11 +27,14 @@
 #include <Ice/RequestHandlerFactory.h>
 #include <Ice/ConnectionRequestHandler.h>
 #include <Ice/DefaultsAndOverrides.h>
+#include <Ice/Comparable.h>
+
 #include <IceUtil/StringUtil.h>
 #include <IceUtil/Random.h>
 #include <IceUtil/MutexPtrLock.h>
 
 #include <functional>
+#include <algorithm>
 
 using namespace std;
 using namespace Ice;
@@ -376,7 +379,6 @@ IceInternal::Reference::operator==(const Reference& r) const
     {
         return false;
     }
-
     return true;
 }
 
@@ -654,14 +656,14 @@ IceInternal::FixedReference::changeAdapterId(const string& /*newAdapterId*/) con
 }
 
 ReferencePtr
-IceInternal::FixedReference::changeLocator(const LocatorPrx&) const
+IceInternal::FixedReference::changeLocator(const LocatorPrxPtr&) const
 {
     throw FixedProxyException(__FILE__, __LINE__);
     return 0; // Keep the compiler happy.
 }
 
 ReferencePtr
-IceInternal::FixedReference::changeRouter(const RouterPrx&) const
+IceInternal::FixedReference::changeRouter(const RouterPrxPtr&) const
 {
     throw FixedProxyException(__FILE__, __LINE__);
     return 0; // Keep the compiler happy.
@@ -753,7 +755,7 @@ IceInternal::FixedReference::toProperty(const string&) const
 }
 
 RequestHandlerPtr
-IceInternal::FixedReference::getRequestHandler(const Ice::ObjectPrx& proxy) const
+IceInternal::FixedReference::getRequestHandler(const Ice::ObjectPrxPtr& proxy) const
 {
     switch(getMode())
     {
@@ -815,7 +817,7 @@ IceInternal::FixedReference::getRequestHandler(const Ice::ObjectPrx& proxy) cons
     }
 
     ReferencePtr ref = const_cast<FixedReference*>(this);
-    return proxy->__setRequestHandler(new ConnectionRequestHandler(ref, _fixedConnection, compress));
+    return proxy->__setRequestHandler(ICE_MAKE_SHARED(ConnectionRequestHandler, ref, _fixedConnection, compress));
 }
 
 BatchRequestQueuePtr
@@ -1039,7 +1041,7 @@ IceInternal::RoutableReference::changeAdapterId(const string& newAdapterId) cons
 }
 
 ReferencePtr
-IceInternal::RoutableReference::changeLocator(const LocatorPrx& newLocator) const
+IceInternal::RoutableReference::changeLocator(const LocatorPrxPtr& newLocator) const
 {
     LocatorInfoPtr newLocatorInfo = getInstance()->locatorManager()->get(newLocator);
     if(newLocatorInfo == _locatorInfo)
@@ -1052,7 +1054,7 @@ IceInternal::RoutableReference::changeLocator(const LocatorPrx& newLocator) cons
 }
 
 ReferencePtr
-IceInternal::RoutableReference::changeRouter(const RouterPrx& newRouter) const
+IceInternal::RoutableReference::changeRouter(const RouterPrxPtr& newRouter) const
 {
     RouterInfoPtr newRouterInfo = getInstance()->routerManager()->get(newRouter);
     if(newRouterInfo == _routerInfo)
@@ -1351,7 +1353,12 @@ IceInternal::RoutableReference::operator==(const Reference& r) const
     {
         return false;
     }
+#ifdef ICE_CPP11_MAPPING
+    if(!equal(_endpoints.begin(), _endpoints.end(), rhs->_endpoints.begin(), rhs->_endpoints.end(), 
+              Ice::TargetEquals<shared_ptr<EndpointI>>()))
+#else
     if(_endpoints != rhs->_endpoints)
+#endif
     {
         return false;
     }
@@ -1479,7 +1486,12 @@ IceInternal::RoutableReference::operator<(const Reference& r) const
     {
         return false;
     }
+#ifdef ICE_CPP11_MAPPING
+    if(lexicographical_compare(_endpoints.begin(), _endpoints.end(), rhs->_endpoints.begin(), rhs->_endpoints.end(),
+                               Ice::TargetLess<shared_ptr<EndpointI>>()))
+#else    
     if(_endpoints < rhs->_endpoints)
+#endif
     {
         return true;
     }
@@ -1505,7 +1517,7 @@ IceInternal::RoutableReference::clone() const
 }
 
 RequestHandlerPtr
-IceInternal::RoutableReference::getRequestHandler(const Ice::ObjectPrx& proxy) const
+IceInternal::RoutableReference::getRequestHandler(const Ice::ObjectPrxPtr& proxy) const
 {
     return getInstance()->requestHandlerFactory()->getRequestHandler(const_cast<RoutableReference*>(this), proxy);
 }
@@ -1640,7 +1652,7 @@ IceInternal::RoutableReference::getConnectionNoRouterInfo(const GetConnectionCal
 
             vector<EndpointIPtr> endpts = endpoints;
             _reference->applyOverrides(endpts);
-            _reference->createConnection(endpts, new Callback2(_reference, _callback, cached));
+            _reference->createConnection(endpts, ICE_MAKE_SHARED(Callback2, _reference, _callback, cached));
         }
 
         virtual void
diff --git a/cpp/src/Ice/Reference.h b/cpp/src/Ice/Reference.h
index a8d1b773c46..d10e2c71c3d 100644
--- a/cpp/src/Ice/Reference.h
+++ b/cpp/src/Ice/Reference.h
@@ -36,14 +36,17 @@ class Reference : public IceUtil::Shared
 {
 public:
 
-    class GetConnectionCallback : virtual public IceUtil::Shared
+    class GetConnectionCallback 
+#ifndef ICE_CPP11_MAPPING
+        : virtual public IceUtil::Shared
+#endif
     {
     public:
 
         virtual void setConnection(const Ice::ConnectionIPtr&, bool) = 0;
         virtual void setException(const Ice::LocalException&) = 0;
     };
-    typedef IceUtil::Handle<GetConnectionCallback> GetConnectionCallbackPtr;
+    ICE_DEFINE_PTR(GetConnectionCallbackPtr, GetConnectionCallback);
 
     enum Mode
     {
@@ -95,8 +98,8 @@ public:
 
     virtual ReferencePtr changeEndpoints(const std::vector<EndpointIPtr>&) const = 0;
     virtual ReferencePtr changeAdapterId(const std::string&) const = 0;
-    virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const = 0;
-    virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const = 0;
+    virtual ReferencePtr changeLocator(const Ice::LocatorPrxPtr&) const = 0;
+    virtual ReferencePtr changeRouter(const Ice::RouterPrxPtr&) const = 0;
     virtual ReferencePtr changeCollocationOptimized(bool) const = 0;
     virtual ReferencePtr changeLocatorCacheTimeout(int) const = 0;
     virtual ReferencePtr changeCacheConnection(bool) const = 0;
@@ -132,7 +135,7 @@ public:
     //
     // Get a suitable connection for this reference.
     //
-    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const = 0;
+    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrxPtr&) const = 0;
     virtual BatchRequestQueuePtr getBatchRequestQueue() const = 0;
 
     virtual bool operator==(const Reference&) const;
@@ -190,8 +193,8 @@ public:
 
     virtual ReferencePtr changeEndpoints(const std::vector<EndpointIPtr>&) const;
     virtual ReferencePtr changeAdapterId(const std::string&) const;
-    virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const;
-    virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const;
+    virtual ReferencePtr changeLocator(const Ice::LocatorPrxPtr&) const;
+    virtual ReferencePtr changeRouter(const Ice::RouterPrxPtr&) const;
     virtual ReferencePtr changeCollocationOptimized(bool) const;
     virtual ReferencePtr changeCacheConnection(bool) const;
     virtual ReferencePtr changePreferSecure(bool) const;
@@ -208,7 +211,7 @@ public:
     virtual std::string toString() const;
     virtual Ice::PropertyDict toProperty(const std::string&) const;
 
-    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const;
+    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrxPtr&) const;
     virtual BatchRequestQueuePtr getBatchRequestQueue() const;
 
     virtual bool operator==(const Reference&) const;
@@ -248,8 +251,8 @@ public:
     virtual ReferencePtr changeCompress(bool) const;
     virtual ReferencePtr changeEndpoints(const std::vector<EndpointIPtr>&) const;
     virtual ReferencePtr changeAdapterId(const std::string&) const;
-    virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const;
-    virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const;
+    virtual ReferencePtr changeLocator(const Ice::LocatorPrxPtr&) const;
+    virtual ReferencePtr changeRouter(const Ice::RouterPrxPtr&) const;
     virtual ReferencePtr changeCollocationOptimized(bool) const;
     virtual ReferencePtr changeCacheConnection(bool) const;
     virtual ReferencePtr changePreferSecure(bool) const;
@@ -272,7 +275,7 @@ public:
 
     virtual ReferencePtr clone() const;
 
-    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrx&) const;
+    virtual RequestHandlerPtr getRequestHandler(const Ice::ObjectPrxPtr&) const;
     virtual BatchRequestQueuePtr getBatchRequestQueue() const;
 
     void getConnection(const GetConnectionCallbackPtr&) const;
diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp
index 24c5d1d384b..fd6a833311d 100644
--- a/cpp/src/Ice/ReferenceFactory.cpp
+++ b/cpp/src/Ice/ReferenceFactory.cpp
@@ -660,7 +660,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
 }
 
 ReferenceFactoryPtr
-IceInternal::ReferenceFactory::setDefaultRouter(const RouterPrx& defaultRouter)
+IceInternal::ReferenceFactory::setDefaultRouter(const RouterPrxPtr& defaultRouter)
 {
     if(defaultRouter == _defaultRouter)
     {
@@ -673,14 +673,14 @@ IceInternal::ReferenceFactory::setDefaultRouter(const RouterPrx& defaultRouter)
     return factory;
 }
 
-RouterPrx
+RouterPrxPtr
 IceInternal::ReferenceFactory::getDefaultRouter() const
 {
     return _defaultRouter;
 }
 
 ReferenceFactoryPtr
-IceInternal::ReferenceFactory::setDefaultLocator(const LocatorPrx& defaultLocator)
+IceInternal::ReferenceFactory::setDefaultLocator(const LocatorPrxPtr& defaultLocator)
 {
     if(defaultLocator == _defaultLocator)
     {
@@ -693,7 +693,7 @@ IceInternal::ReferenceFactory::setDefaultLocator(const LocatorPrx& defaultLocato
     return factory;
 }
 
-LocatorPrx
+LocatorPrxPtr
 IceInternal::ReferenceFactory::getDefaultLocator() const
 {
     return _defaultLocator;
@@ -815,7 +815,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
         string property;
 
         property = propertyPrefix + ".Locator";
-        LocatorPrx locator = LocatorPrx::uncheckedCast(_communicator->propertyToProxy(property));
+        LocatorPrxPtr locator = ICE_UNCHECKED_CAST(LocatorPrx, _communicator->propertyToProxy(property));
         if(locator)
         {
             if(locator->ice_getEncodingVersion() != encoding)
@@ -829,7 +829,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
         }
 
         property = propertyPrefix + ".Router";
-        RouterPrx router = RouterPrx::uncheckedCast(_communicator->propertyToProxy(property));
+        RouterPrxPtr router = ICE_UNCHECKED_CAST(RouterPrx, _communicator->propertyToProxy(property));
         if(router)
         {
             if(propertyPrefix.size() > 7 && propertyPrefix.substr(propertyPrefix.size() - 7, 7) == ".Router")
diff --git a/cpp/src/Ice/ReferenceFactory.h b/cpp/src/Ice/ReferenceFactory.h
index 2a38f6d72e1..12c396ee440 100644
--- a/cpp/src/Ice/ReferenceFactory.h
+++ b/cpp/src/Ice/ReferenceFactory.h
@@ -54,11 +54,11 @@ public:
     //
     ReferencePtr create(const ::Ice::Identity&, BasicStream*);
 
-    ReferenceFactoryPtr setDefaultRouter(const ::Ice::RouterPrx&);
-    ::Ice::RouterPrx getDefaultRouter() const;
+    ReferenceFactoryPtr setDefaultRouter(const ::Ice::RouterPrxPtr&);
+    ::Ice::RouterPrxPtr getDefaultRouter() const;
 
-    ReferenceFactoryPtr setDefaultLocator(const ::Ice::LocatorPrx&);
-    ::Ice::LocatorPrx getDefaultLocator() const;
+    ReferenceFactoryPtr setDefaultLocator(const ::Ice::LocatorPrxPtr&);
+    ::Ice::LocatorPrxPtr getDefaultLocator() const;
 
 private:
 
@@ -72,8 +72,8 @@ private:
 
     const InstancePtr _instance;
     const ::Ice::CommunicatorPtr _communicator;
-    ::Ice::RouterPrx _defaultRouter;
-    ::Ice::LocatorPrx _defaultLocator;
+    ::Ice::RouterPrxPtr _defaultRouter;
+    ::Ice::LocatorPrxPtr _defaultLocator;
 };
 
 }
diff --git a/cpp/src/Ice/RequestHandler.cpp b/cpp/src/Ice/RequestHandler.cpp
index 4cef97a0909..62acf7e4ef3 100644
--- a/cpp/src/Ice/RequestHandler.cpp
+++ b/cpp/src/Ice/RequestHandler.cpp
@@ -13,8 +13,10 @@
 using namespace std;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(RequestHandler* p) { return p; }
 IceUtil::Shared* IceInternal::upCast(CancellationHandler* p) { return p; }
+#endif
 
 RetryException::RetryException(const Ice::LocalException& ex)
 {
diff --git a/cpp/src/Ice/RequestHandler.h b/cpp/src/Ice/RequestHandler.h
index 03a55f7773d..cfe7db10845 100644
--- a/cpp/src/Ice/RequestHandler.h
+++ b/cpp/src/Ice/RequestHandler.h
@@ -52,7 +52,10 @@ private:
     IceUtil::UniquePtr<Ice::LocalException> _ex;
 };
 
-class CancellationHandler : virtual public IceUtil::Shared
+class CancellationHandler
+#ifndef ICE_CPP11_MAPPING
+    : virtual public IceUtil::Shared
+#endif
 {
 public:
 
@@ -63,6 +66,8 @@ public:
 class RequestHandler : public CancellationHandler
 {
 public:
+    
+    RequestHandler(const ReferencePtr&);
 
     virtual RequestHandlerPtr update(const RequestHandlerPtr&, const RequestHandlerPtr&) = 0;
 
@@ -76,7 +81,6 @@ public:
 
 protected:
 
-    RequestHandler(const ReferencePtr&);
     const ReferencePtr _reference;
     const bool _response;
 };
diff --git a/cpp/src/Ice/RequestHandlerFactory.cpp b/cpp/src/Ice/RequestHandlerFactory.cpp
index 0b2d0ff10ed..029a4001e50 100644
--- a/cpp/src/Ice/RequestHandlerFactory.cpp
+++ b/cpp/src/Ice/RequestHandlerFactory.cpp
@@ -23,14 +23,14 @@ RequestHandlerFactory::RequestHandlerFactory(const InstancePtr& instance) : _ins
 }
 
 RequestHandlerPtr
-IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr& ref, const Ice::ObjectPrx& proxy)
+IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr& ref, const Ice::ObjectPrxPtr& proxy)
 {
     if(ref->getCollocationOptimized())
     {
         Ice::ObjectAdapterPtr adapter = _instance->objectAdapterFactory()->findObjectAdapter(proxy);
         if(adapter)
         {
-            return proxy->__setRequestHandler(new CollocatedRequestHandler(ref, adapter));
+            return proxy->__setRequestHandler(ICE_MAKE_SHARED(CollocatedRequestHandler, ref, adapter));
         }
     }
 
@@ -42,7 +42,7 @@ IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr
         map<ReferencePtr, ConnectRequestHandlerPtr>::iterator p = _handlers.find(ref);
         if(p == _handlers.end())
         {
-            handler = new ConnectRequestHandler(ref, proxy);
+            handler = ICE_MAKE_SHARED(ConnectRequestHandler, ref, proxy);
             _handlers.insert(make_pair(ref, handler));
             connect = true;
         }
@@ -53,12 +53,16 @@ IceInternal::RequestHandlerFactory::getRequestHandler(const RoutableReferencePtr
     }
     else
     {
-        handler = new ConnectRequestHandler(ref, proxy);
+        handler = ICE_MAKE_SHARED(ConnectRequestHandler, ref, proxy);
         connect = true;
     }
     if(connect)
     {
+#ifdef ICE_CPP11_MAPPING
+        ref->getConnection(handler);
+#else
         ref->getConnection(handler.get());
+#endif
     }
     return proxy->__setRequestHandler(handler->connect(proxy));
 }
diff --git a/cpp/src/Ice/RequestHandlerFactory.h b/cpp/src/Ice/RequestHandlerFactory.h
index 6a9aec0114d..3a009e2a3c3 100644
--- a/cpp/src/Ice/RequestHandlerFactory.h
+++ b/cpp/src/Ice/RequestHandlerFactory.h
@@ -28,7 +28,7 @@ public:
 
     RequestHandlerFactory(const InstancePtr&);
 
-    RequestHandlerPtr getRequestHandler(const RoutableReferencePtr&, const Ice::ObjectPrx&);
+    RequestHandlerPtr getRequestHandler(const RoutableReferencePtr&, const Ice::ObjectPrxPtr&);
     void removeRequestHandler(const ReferencePtr&, const RequestHandlerPtr&);
 
 private:
diff --git a/cpp/src/Ice/ResponseHandler.cpp b/cpp/src/Ice/ResponseHandler.cpp
index 26ed3f231f8..7693477aef9 100644
--- a/cpp/src/Ice/ResponseHandler.cpp
+++ b/cpp/src/Ice/ResponseHandler.cpp
@@ -12,9 +12,6 @@
 using namespace std;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(ResponseHandler* obj) { return obj; }
-
-ResponseHandler::~ResponseHandler()
-{
-}
-
+#endif
\ No newline at end of file
diff --git a/cpp/src/Ice/ResponseHandler.h b/cpp/src/Ice/ResponseHandler.h
index 23ed39fd70d..0838953bc41 100644
--- a/cpp/src/Ice/ResponseHandler.h
+++ b/cpp/src/Ice/ResponseHandler.h
@@ -16,18 +16,22 @@
 #include <Ice/Config.h>
 #include <Ice/LocalException.h>
 #include <Ice/ResponseHandlerF.h>
+#include <Ice/VirtualShared.h>
 
 namespace IceInternal
 {
 
 class BasicStream;
 
-class ResponseHandler : virtual public ::IceUtil::Shared
+class ResponseHandler :
+#ifdef ICE_CPP11_MAPPING
+    public virtual VirtualShared
+#else
+    public virtual ::IceUtil::Shared
+#endif
 {
 public:
 
-    virtual ~ResponseHandler();
-
     virtual void sendResponse(Ice::Int, BasicStream*, Ice::Byte, bool) = 0;
     virtual void sendNoResponse() = 0;
     virtual bool systemException(Ice::Int, const Ice::SystemException&, bool) = 0;
diff --git a/cpp/src/Ice/RetryQueue.cpp b/cpp/src/Ice/RetryQueue.cpp
index 6cf87596708..84a8997bd4a 100644
--- a/cpp/src/Ice/RetryQueue.cpp
+++ b/cpp/src/Ice/RetryQueue.cpp
@@ -40,7 +40,7 @@ IceInternal::RetryTask::runTimerTask()
     // (we still need the client thread pool at this point to call
     // exception callbacks with CommunicatorDestroyedException).
     //
-    _queue->remove(this);
+    _queue->remove(ICE_SHARED_FROM_THIS);
 }
 
 void
@@ -52,7 +52,7 @@ IceInternal::RetryTask::requestCanceled(OutgoingBase*, const Ice::LocalException
 void
 IceInternal::RetryTask::asyncRequestCanceled(const OutgoingAsyncBasePtr& outAsync, const Ice::LocalException& ex)
 {
-    if(_queue->cancel(this))
+    if(_queue->cancel(ICE_SHARED_FROM_THIS))
     {
         if(_instance->traceLevels()->retry >= 1)
         {
@@ -97,7 +97,7 @@ IceInternal::RetryQueue::add(const ProxyOutgoingAsyncBasePtr& out, int interval)
     {
         throw CommunicatorDestroyedException(__FILE__, __LINE__);
     }
-    RetryTaskPtr task = new RetryTask(_instance, this, out);
+    RetryTaskPtr task = ICE_MAKE_SHARED(RetryTask, _instance, this, out);
     out->cancelable(task); // This will throw if the request is canceled.
     try
     {
diff --git a/cpp/src/Ice/RetryQueue.h b/cpp/src/Ice/RetryQueue.h
index e7d4c62728c..07e5e5ac39e 100644
--- a/cpp/src/Ice/RetryQueue.h
+++ b/cpp/src/Ice/RetryQueue.h
@@ -21,7 +21,9 @@
 namespace IceInternal
 {
 
-class RetryTask : public IceUtil::TimerTask, public CancellationHandler
+class RetryTask : public IceUtil::TimerTask,
+                  public CancellationHandler,
+                  public ICE_ENABLE_SHARED_FROM_THIS(RetryTask)
 {
 public:
 
@@ -43,7 +45,7 @@ private:
     const RetryQueuePtr _queue;
     const ProxyOutgoingAsyncBasePtr _outAsync;
 };
-typedef IceUtil::Handle<RetryTask> RetryTaskPtr;
+ICE_DEFINE_PTR(RetryTaskPtr, RetryTask);
 
 class RetryQueue : public IceUtil::Shared, public IceUtil::Monitor<IceUtil::Mutex>
 {
diff --git a/cpp/src/Ice/RouterInfo.cpp b/cpp/src/Ice/RouterInfo.cpp
index 49f3ac389ed..f0afc392990 100644
--- a/cpp/src/Ice/RouterInfo.cpp
+++ b/cpp/src/Ice/RouterInfo.cpp
@@ -30,27 +30,29 @@ void
 IceInternal::RouterManager::destroy()
 {
     IceUtil::Mutex::Lock sync(*this);
-
-    for_each(_table.begin(), _table.end(), Ice::secondVoidMemFun<const RouterPrx, RouterInfo>(&RouterInfo::destroy));
-
+#ifdef ICE_CPP11_MAPPING
+    for_each(_table.begin(), _table.end(), [](auto it){ it.second->destroy(); });
+#else
+    for_each(_table.begin(), _table.end(), Ice::secondVoidMemFun<const RouterPrxPtr, RouterInfo>(&RouterInfo::destroy));
+#endif
     _table.clear();
     _tableHint = _table.end();
 }
 
 RouterInfoPtr
-IceInternal::RouterManager::get(const RouterPrx& rtr)
+IceInternal::RouterManager::get(const RouterPrxPtr& rtr)
 {
     if(!rtr)
     {
         return 0;
     }
 
-    RouterPrx router = RouterPrx::uncheckedCast(rtr->ice_router(0)); // The router cannot be routed.
+    RouterPrxPtr router = ICE_UNCHECKED_CAST(RouterPrx, rtr->ice_router(0)); // The router cannot be routed.
 
     IceUtil::Mutex::Lock sync(*this);
 
-    map<RouterPrx, RouterInfoPtr>::iterator p = _table.end();
-    
+    map<RouterPrxPtr, RouterInfoPtr>::iterator p = _table.end();
+
     if(_tableHint != _table.end())
     {
         if(_tableHint->first == router)
@@ -58,7 +60,7 @@ IceInternal::RouterManager::get(const RouterPrx& rtr)
             p = _tableHint;
         }
     }
-    
+
     if(p == _table.end())
     {
         p = _table.find(router);
@@ -66,7 +68,7 @@ IceInternal::RouterManager::get(const RouterPrx& rtr)
 
     if(p == _table.end())
     {
-        _tableHint = _table.insert(_tableHint, pair<const RouterPrx, RouterInfoPtr>(router, new RouterInfo(router)));
+        _tableHint = _table.insert(_tableHint, pair<const RouterPrxPtr, RouterInfoPtr>(router, new RouterInfo(router)));
     }
     else
     {
@@ -77,26 +79,26 @@ IceInternal::RouterManager::get(const RouterPrx& rtr)
 }
 
 RouterInfoPtr
-IceInternal::RouterManager::erase(const RouterPrx& rtr)
+IceInternal::RouterManager::erase(const RouterPrxPtr& rtr)
 {
     RouterInfoPtr info;
     if(rtr)
     {
-        RouterPrx router = RouterPrx::uncheckedCast(rtr->ice_router(0)); // The router cannot be routed.
+        RouterPrxPtr router = ICE_UNCHECKED_CAST(RouterPrx, rtr->ice_router(ICE_NULLPTR)); // The router cannot be routed.
         IceUtil::Mutex::Lock sync(*this);
 
-        map<RouterPrx, RouterInfoPtr>::iterator p = _table.end();
+        map<RouterPrxPtr, RouterInfoPtr>::iterator p = _table.end();
         if(_tableHint != _table.end() && _tableHint->first == router)
         {
             p = _tableHint;
             _tableHint = _table.end();
         }
-        
+
         if(p == _table.end())
         {
             p = _table.find(router);
         }
-        
+
         if(p != _table.end())
         {
             info = p->second;
@@ -107,7 +109,7 @@ IceInternal::RouterManager::erase(const RouterPrx& rtr)
     return info;
 }
 
-IceInternal::RouterInfo::RouterInfo(const RouterPrx& router) :
+IceInternal::RouterInfo::RouterInfo(const RouterPrxPtr& router) :
     _router(router)
 {
     assert(_router);
@@ -127,19 +129,31 @@ IceInternal::RouterInfo::destroy()
 bool
 IceInternal::RouterInfo::operator==(const RouterInfo& rhs) const
 {
+#ifdef ICE_CPP11_MAPPING
+    return Ice::targetEquals(_router, rhs._router);
+#else
     return _router == rhs._router;
+#endif
 }
 
 bool
 IceInternal::RouterInfo::operator!=(const RouterInfo& rhs) const
 {
+#ifdef ICE_CPP11_MAPPING
+    return !Ice::targetEquals(_router, rhs._router);
+#else
     return _router != rhs._router;
+#endif
 }
 
 bool
 IceInternal::RouterInfo::operator<(const RouterInfo& rhs) const
 {
+#ifdef ICE_CPP11_MAPPING
+    return Ice::targetLess(_router, rhs._router);
+#else
     return _router < rhs._router;
+#endif
 }
 
 vector<EndpointIPtr>
@@ -157,14 +171,14 @@ IceInternal::RouterInfo::getClientEndpoints()
 }
 
 void
-IceInternal::RouterInfo::getClientProxyResponse(const Ice::ObjectPrx& proxy, 
+IceInternal::RouterInfo::getClientProxyResponse(const Ice::ObjectPrxPtr& proxy,
                                                 const GetClientEndpointsCallbackPtr& callback)
 {
     callback->setEndpoints(setClientEndpoints(proxy));
 }
 
 void
-IceInternal::RouterInfo::getClientProxyException(const Ice::Exception& ex, 
+IceInternal::RouterInfo::getClientProxyException(const Ice::Exception& ex,
                                                  const GetClientEndpointsCallbackPtr& callback)
 {
     callback->setException(dynamic_cast<const Ice::LocalException&>(ex));
@@ -185,10 +199,29 @@ IceInternal::RouterInfo::getClientEndpoints(const GetClientEndpointsCallbackPtr&
         return;
     }
 
-    _router->begin_getClientProxy(newCallback_Router_getClientProxy(this, 
-                                                                    &RouterInfo::getClientProxyResponse, 
+#ifdef ICE_CPP11_MAPPING
+    _router->getClientProxy_async(
+        [this, callback](const Ice::ObjectPrxPtr& proxy)
+        {
+            this->getClientProxyResponse(proxy, callback);
+        },
+        [this, callback](exception_ptr e)
+        {
+            try
+            {
+                rethrow_exception(e);
+            }
+            catch(const Ice::Exception& ex)
+            {
+                this->getClientProxyException(ex, callback);
+            }
+        });
+#else
+    _router->begin_getClientProxy(newCallback_Router_getClientProxy(this,
+                                                                    &RouterInfo::getClientProxyResponse,
                                                                     &RouterInfo::getClientProxyException),
                                   callback);
+#endif
 }
 
 vector<EndpointIPtr>
@@ -206,7 +239,7 @@ IceInternal::RouterInfo::getServerEndpoints()
 }
 
 void
-IceInternal::RouterInfo::addProxy(const ObjectPrx& proxy)
+IceInternal::RouterInfo::addProxy(const ObjectPrxPtr& proxy)
 {
     assert(proxy); // Must not be called for null proxies.
 
@@ -240,7 +273,7 @@ IceInternal::RouterInfo::addProxyException(const Ice::Exception& ex, const AddPr
 }
 
 bool
-IceInternal::RouterInfo::addProxy(const Ice::ObjectPrx& proxy, const AddProxyCallbackPtr& callback)
+IceInternal::RouterInfo::addProxy(const Ice::ObjectPrxPtr& proxy, const AddProxyCallbackPtr& callback)
 {
     assert(proxy);
     {
@@ -258,11 +291,31 @@ IceInternal::RouterInfo::addProxy(const Ice::ObjectPrx& proxy, const AddProxyCal
     Ice::ObjectProxySeq proxies;
     proxies.push_back(proxy);
     AddProxyCookiePtr cookie = new AddProxyCookie(callback, proxy);
+
+#ifdef ICE_CPP11_MAPPING
+    _router->addProxies_async(proxies,
+        [this, cookie](const Ice::ObjectProxySeq& proxies)
+        {
+            this->addProxyResponse(proxies, cookie);
+        },
+        [this, cookie](exception_ptr e)
+        {
+            try
+            {
+                rethrow_exception(e);
+            }
+            catch(const Ice::Exception& ex)
+            {
+                this->addProxyException(ex, cookie);
+            }
+        });
+#else
     _router->begin_addProxies(proxies,
-                              newCallback_Router_addProxies(this, 
-                                                            &RouterInfo::addProxyResponse, 
-                                                            &RouterInfo::addProxyException), 
+                              newCallback_Router_addProxies(this,
+                                                            &RouterInfo::addProxyResponse,
+                                                            &RouterInfo::addProxyException),
                               cookie);
+#endif
     return false;
 }
 
@@ -288,7 +341,7 @@ IceInternal::RouterInfo::clearCache(const ReferencePtr& ref)
 }
 
 vector<EndpointIPtr>
-IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrx& proxy)
+IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrxPtr& proxy)
 {
     IceUtil::Mutex::Lock sync(*this);
     if(_clientEndpoints.empty())
@@ -302,7 +355,7 @@ IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrx& proxy)
         }
         else
         {
-            Ice::ObjectPrx clientProxy = proxy->ice_router(0); // The client proxy cannot be routed.
+            Ice::ObjectPrxPtr clientProxy = proxy->ice_router(0); // The client proxy cannot be routed.
 
             //
             // In order to avoid creating a new connection to the router,
@@ -322,12 +375,12 @@ IceInternal::RouterInfo::setClientEndpoints(const Ice::ObjectPrx& proxy)
 
 
 vector<EndpointIPtr>
-IceInternal::RouterInfo::setServerEndpoints(const Ice::ObjectPrx& /*serverProxy*/)
+IceInternal::RouterInfo::setServerEndpoints(const Ice::ObjectPrxPtr& /*serverProxy*/)
 {
     IceUtil::Mutex::Lock sync(*this);
     if(_serverEndpoints.empty()) // Lazy initialization.
     {
-        ObjectPrx serverProxy = _router->getServerProxy();
+        ObjectPrxPtr serverProxy = _router->getServerProxy();
         if(!serverProxy)
         {
             throw NoEndpointException(__FILE__, __LINE__);
@@ -341,12 +394,12 @@ IceInternal::RouterInfo::setServerEndpoints(const Ice::ObjectPrx& /*serverProxy*
 }
 
 void
-IceInternal::RouterInfo::addAndEvictProxies(const Ice::ObjectPrx& proxy, const Ice::ObjectProxySeq& evictedProxies)
+IceInternal::RouterInfo::addAndEvictProxies(const Ice::ObjectPrxPtr& proxy, const Ice::ObjectProxySeq& evictedProxies)
 {
     IceUtil::Mutex::Lock sync(*this);
 
     //
-    // Check if the proxy hasn't already been evicted by a concurrent addProxies call. 
+    // Check if the proxy hasn't already been evicted by a concurrent addProxies call.
     // If it's the case, don't add it to our local map.
     //
     multiset<Identity>::iterator p = _evictedIdentities.find(proxy->ice_getIdentity());
@@ -362,7 +415,7 @@ IceInternal::RouterInfo::addAndEvictProxies(const Ice::ObjectPrx& proxy, const I
         //
         _identities.insert(proxy->ice_getIdentity());
     }
-    
+
     //
     // We also must remove whatever proxies the router evicted.
     //
diff --git a/cpp/src/Ice/RouterInfo.h b/cpp/src/Ice/RouterInfo.h
index 848cd7e0e04..9f6a1dbfef2 100644
--- a/cpp/src/Ice/RouterInfo.h
+++ b/cpp/src/Ice/RouterInfo.h
@@ -13,12 +13,13 @@
 #include <IceUtil/Shared.h>
 #include <IceUtil/Mutex.h>
 #include <Ice/RouterInfoF.h>
-#include <Ice/RouterF.h>
+#include <Ice/Router.h>
 #include <Ice/ProxyF.h>
 #include <Ice/ReferenceF.h>
 #include <Ice/EndpointIF.h>
 #include <Ice/BuiltinSequences.h>
 #include <Ice/Identity.h>
+#include <Ice/Comparable.h>
 
 #include <set>
 
@@ -37,13 +38,21 @@ public:
     // Returns router info for a given router. Automatically creates
     // the router info if it doesn't exist yet.
     //
-    RouterInfoPtr get(const Ice::RouterPrx&);
-    RouterInfoPtr erase(const Ice::RouterPrx&);
+    RouterInfoPtr get(const Ice::RouterPrxPtr&);
+    RouterInfoPtr erase(const Ice::RouterPrxPtr&);
 
 private:
 
-    std::map<Ice::RouterPrx, RouterInfoPtr> _table;
-    std::map<Ice::RouterPrx, RouterInfoPtr>::iterator _tableHint;
+#ifdef ICE_CPP11_MAPPING
+    using RouterTableMap = std::map<std::shared_ptr<Ice::RouterPrx>, 
+    RouterInfoPtr,
+                                    Ice::TargetLess<std::shared_ptr<::Ice::RouterPrx>>>;
+#else
+    typedef std::map<Ice::RouterPrxPtr, RouterInfoPtr> RouterTableMap;
+#endif
+    
+    RouterTableMap _table;
+    RouterTableMap::iterator _tableHint;
 };
 
 class RouterInfo : public IceUtil::Shared, public IceUtil::Mutex
@@ -59,16 +68,19 @@ public:
     };
     typedef IceUtil::Handle<GetClientEndpointsCallback> GetClientEndpointsCallbackPtr;
 
-    class AddProxyCallback : virtual public IceUtil::Shared
+    class AddProxyCallback 
+#ifndef ICE_CPP11_MAPPING
+        : virtual public IceUtil::Shared
+#endif
     {
     public:
         
         virtual void addedProxy() = 0;
         virtual void setException(const Ice::LocalException&) = 0;
     };
-    typedef IceUtil::Handle<AddProxyCallback> AddProxyCallbackPtr; 
+    ICE_DEFINE_PTR(AddProxyCallbackPtr, AddProxyCallback); 
 
-    RouterInfo(const Ice::RouterPrx&);
+    RouterInfo(const Ice::RouterPrxPtr&);
 
     void destroy();
 
@@ -76,14 +88,14 @@ public:
     bool operator!=(const RouterInfo&) const;
     bool operator<(const RouterInfo&) const;
 
-    const Ice::RouterPrx& getRouter() const
+    const Ice::RouterPrxPtr& getRouter() const
     {
         //
         // No mutex lock necessary, _router is immutable.
         //
         return _router;
     }
-    void getClientProxyResponse(const Ice::ObjectPrx&, const GetClientEndpointsCallbackPtr&);
+    void getClientProxyResponse(const Ice::ObjectPrxPtr&, const GetClientEndpointsCallbackPtr&);
     void getClientProxyException(const Ice::Exception&, const GetClientEndpointsCallbackPtr&);
     std::vector<EndpointIPtr> getClientEndpoints();
     void getClientEndpoints(const GetClientEndpointsCallbackPtr&);
@@ -93,7 +105,7 @@ public:
     {
     public:
         
-        AddProxyCookie(const AddProxyCallbackPtr cb, const Ice::ObjectPrx& proxy) :
+        AddProxyCookie(const AddProxyCallbackPtr cb, const Ice::ObjectPrxPtr& proxy) :
             _cb(cb),
             _proxy(proxy)
         {
@@ -104,7 +116,7 @@ public:
             return _cb;
         }
         
-        Ice::ObjectPrx proxy() const
+        Ice::ObjectPrxPtr proxy() const
         {
             return _proxy;
         }
@@ -112,14 +124,14 @@ public:
     private:
         
         const AddProxyCallbackPtr _cb;
-        const Ice::ObjectPrx _proxy;
+        const Ice::ObjectPrxPtr _proxy;
     };
     typedef IceUtil::Handle<AddProxyCookie> AddProxyCookiePtr;
     
     void addProxyResponse(const Ice::ObjectProxySeq&, const AddProxyCookiePtr&);
     void addProxyException(const Ice::Exception&, const AddProxyCookiePtr&);
-    void addProxy(const Ice::ObjectPrx&);
-    bool addProxy(const Ice::ObjectPrx&, const AddProxyCallbackPtr&);
+    void addProxy(const Ice::ObjectPrxPtr&);
+    bool addProxy(const Ice::ObjectPrxPtr&, const AddProxyCallbackPtr&);
 
     void setAdapter(const Ice::ObjectAdapterPtr&);
     Ice::ObjectAdapterPtr getAdapter() const;
@@ -129,13 +141,13 @@ public:
     //
     // The following methods need to be public for access by AMI callbacks.
     //
-    std::vector<EndpointIPtr> setClientEndpoints(const Ice::ObjectPrx&);
-    std::vector<EndpointIPtr> setServerEndpoints(const Ice::ObjectPrx&);
-    void addAndEvictProxies(const Ice::ObjectPrx&, const Ice::ObjectProxySeq&);
+    std::vector<EndpointIPtr> setClientEndpoints(const Ice::ObjectPrxPtr&);
+    std::vector<EndpointIPtr> setServerEndpoints(const Ice::ObjectPrxPtr&);
+    void addAndEvictProxies(const Ice::ObjectPrxPtr&, const Ice::ObjectProxySeq&);
 
 private:
 
-    const Ice::RouterPrx _router;
+    const Ice::RouterPrxPtr _router;
     std::vector<EndpointIPtr> _clientEndpoints;
     std::vector<EndpointIPtr> _serverEndpoints;
     Ice::ObjectAdapterPtr _adapter;
diff --git a/cpp/src/Ice/Selector.cpp b/cpp/src/Ice/Selector.cpp
index 1035955b050..094b6f9734e 100644
--- a/cpp/src/Ice/Selector.cpp
+++ b/cpp/src/Ice/Selector.cpp
@@ -77,11 +77,13 @@ Selector::initialize(EventHandler* handler)
         ex.error = GetLastError();
         throw ex;
     }
-    handler->__incRef();
     handler->getNativeInfo()->initialize(_handle, reinterpret_cast<ULONG_PTR>(handler));
 #else
+#   ifdef ICE_CPP11_MAPPING
+    EventHandlerPtr h = dynamic_pointer_cast<EventHandler>(handler->shared_from_this());
+#   else
     EventHandlerPtr h = handler;
-    handler->__incRef();
+#   endif
     handler->getNativeInfo()->setCompletedHandler(
         ref new SocketOperationCompletedHandler(
             [=](int operation)
@@ -117,7 +119,6 @@ Selector::finish(IceInternal::EventHandler* handler)
 {
     handler->_registered = SocketOperationNone;
     handler->_finish = false; // Ensures that finished() is only called once on the event handler.
-    handler->__decRef();
 }
 
 void
@@ -721,7 +722,12 @@ Selector::finishSelect(vector<pair<EventHandler*, SocketOperation> >& handlers)
             continue; // Interrupted
         }
 
+#ifdef ICE_CPP11_MAPPING
+        map<EventHandlerPtr, SocketOperation>::iterator q = _readyHandlers.find(
+            dynamic_pointer_cast<EventHandler>(p.first->shared_from_this()));
+#else
         map<EventHandlerPtr, SocketOperation>::iterator q = _readyHandlers.find(p.first);
+#endif
         if(q != _readyHandlers.end()) // Handler will be added by the loop below
         {
             q->second = p.second; // We just remember which operations are ready here.
@@ -831,12 +837,22 @@ Selector::checkReady(EventHandler* handler)
 {
     if(handler->_ready & ~handler->_disabled & handler->_registered)
     {
+#ifdef ICE_CPP11_MAPPING
+        _readyHandlers.insert(make_pair(dynamic_pointer_cast<EventHandler>(handler->shared_from_this()), 
+                                        SocketOperationNone));
+#else
         _readyHandlers.insert(make_pair(handler, SocketOperationNone));
+#endif
         wakeup();
     }
     else
     {
+#ifdef ICE_CPP11_MAPPING
+        map<EventHandlerPtr, SocketOperation>::iterator p = 
+            _readyHandlers.find(dynamic_pointer_cast<EventHandler>(handler->shared_from_this()));
+#else
         map<EventHandlerPtr, SocketOperation>::iterator p = _readyHandlers.find(handler);
+#endif
         if(p != _readyHandlers.end())
         {
             _readyHandlers.erase(p);
diff --git a/cpp/src/Ice/Service.cpp b/cpp/src/Ice/Service.cpp
index f2be014be70..3ed40a27d6c 100644
--- a/cpp/src/Ice/Service.cpp
+++ b/cpp/src/Ice/Service.cpp
@@ -196,7 +196,7 @@ public:
     virtual Ice::LoggerPtr
     cloneWithPrefix(const string& prefix)
     {
-        return new SMEventLoggerIWrapper(_logger, prefix);
+        return ICE_MAKE_SHARED(SMEventLoggerIWrapper, _logger, prefix);
     }
 
 private:
@@ -585,10 +585,10 @@ Ice::Service::main(int& argc, char* argv[], const InitializationData& initializa
             // our own logger.
             //
             _logger = getProcessLogger();
-            if(LoggerIPtr::dynamicCast(_logger))
+            if(ICE_DYNAMIC_CAST(LoggerI, _logger))
             {
                 string eventLogSource = initData.properties->getPropertyWithDefault("Ice.EventLog.Source", name);
-                _logger = new SMEventLoggerIWrapper(new SMEventLoggerI(eventLogSource, stringConverter), "");
+                _logger = ICE_MAKE_SHARED(SMEventLoggerIWrapper, new SMEventLoggerI(eventLogSource, stringConverter), "");
                 setProcessLogger(_logger);
             }
 
@@ -712,14 +712,14 @@ Ice::Service::main(int& argc, char* argv[], const InitializationData& initializa
     if(!_logger)
     {
         _logger = getProcessLogger();
-        if(LoggerIPtr::dynamicCast(_logger))
+        if(ICE_DYNAMIC_CAST(LoggerI, _logger))
         {
             const bool convert =
                 initData.properties->getPropertyAsIntWithDefault("Ice.LogStdErr.Convert", 1) > 0 &&
                 initData.properties->getProperty("Ice.StdErr").empty();
 
-            _logger = new LoggerI(initData.properties->getProperty("Ice.ProgramName"), "", convert,
-                                  IceUtil::getProcessStringConverter());
+            _logger = ICE_MAKE_SHARED(LoggerI, initData.properties->getProperty("Ice.ProgramName"), "", convert,
+                                      IceUtil::getProcessStringConverter());
             setProcessLogger(_logger);
         }
     }
diff --git a/cpp/src/Ice/SlicedData.cpp b/cpp/src/Ice/SlicedData.cpp
index b47da253e7f..d721b1c6c91 100644
--- a/cpp/src/Ice/SlicedData.cpp
+++ b/cpp/src/Ice/SlicedData.cpp
@@ -13,15 +13,19 @@
 using namespace std;
 using namespace Ice;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* Ice::upCast(SliceInfo* p) { return p; }
 IceUtil::Shared* Ice::upCast(SlicedData* p) { return p; }
 IceUtil::Shared* Ice::upCast(UnknownSlicedObject* p) { return p; }
+#endif
 
 Ice::SlicedData::SlicedData(const SliceInfoSeq& seq) :
     slices(seq)
 {
 }
 
+
+#ifndef ICE_CPP11_MAPPING
 void
 Ice::SlicedData::__gcVisitMembers(IceInternal::GCVisitor& visitor)
 {
@@ -39,6 +43,7 @@ Ice::SlicedData::__gcVisitMembers(IceInternal::GCVisitor& visitor)
         }
     }
 }
+#endif
 
 Ice::UnknownSlicedObject::UnknownSlicedObject(const string& unknownTypeId) : _unknownTypeId(unknownTypeId)
 {
@@ -56,6 +61,7 @@ Ice::UnknownSlicedObject::getSlicedData() const
     return _slicedData;
 }
 
+#ifndef ICE_CPP11_MAPPING
 void
 Ice::UnknownSlicedObject::__gcVisitMembers(IceInternal::GCVisitor& _v)
 {
@@ -64,6 +70,7 @@ Ice::UnknownSlicedObject::__gcVisitMembers(IceInternal::GCVisitor& _v)
         _slicedData->__gcVisitMembers(_v);
     }
 }
+#endif
 
 void
 Ice::UnknownSlicedObject::__write(IceInternal::BasicStream* __os) const
diff --git a/cpp/src/Ice/StreamI.cpp b/cpp/src/Ice/StreamI.cpp
index 050c32c07ce..a44f891972b 100644
--- a/cpp/src/Ice/StreamI.cpp
+++ b/cpp/src/Ice/StreamI.cpp
@@ -121,10 +121,10 @@ InputStreamI::readAndCheckSeqSize(int minSize)
     return _is->readAndCheckSeqSize(minSize);
 }
 
-ObjectPrx
+ObjectPrxPtr
 InputStreamI::readProxy()
 {
-    ObjectPrx v;
+    ObjectPrxPtr v;
     _is->read(v);
     return v;
 }
@@ -133,7 +133,7 @@ namespace
 {
 
 void
-patchObject(void* addr, const ObjectPtr& v)
+patchObject(void* addr, const ValuePtr& v)
 {
     ReadObjectCallback* cb = static_cast<ReadObjectCallback*>(addr);
     assert(cb);
@@ -454,7 +454,7 @@ OutputStreamI::communicator() const
 }
 
 void
-OutputStreamI::writeObject(const ObjectPtr& v)
+OutputStreamI::writeObject(const ValuePtr& v)
 {
     _os->write(v);
 }
@@ -466,7 +466,7 @@ OutputStreamI::writeException(const UserException& v)
 }
 
 void
-OutputStreamI::writeProxy(const ObjectPrx& v)
+OutputStreamI::writeProxy(const ObjectPrxPtr& v)
 {
     _os->write(v);
 }
diff --git a/cpp/src/Ice/StreamI.h b/cpp/src/Ice/StreamI.h
index 11b659a59c7..d2b8fad2c89 100644
--- a/cpp/src/Ice/StreamI.h
+++ b/cpp/src/Ice/StreamI.h
@@ -41,7 +41,7 @@ public:
     virtual Int readSize();
     virtual Int readAndCheckSeqSize(int);
 
-    virtual ObjectPrx readProxy();
+    virtual ObjectPrxPtr readProxy();
     virtual void readObject(const ReadObjectCallbackPtr&);
 
     virtual void throwException();
@@ -125,9 +125,9 @@ public:
 
     virtual CommunicatorPtr communicator() const;
 
-    virtual void writeObject(const ObjectPtr&);
+    virtual void writeObject(const ValuePtr&);
     virtual void writeException(const UserException&);
-    virtual void writeProxy(const ObjectPrx&);
+    virtual void writeProxy(const ObjectPrxPtr&);
 
     virtual void writeSize(Int);
 
diff --git a/cpp/src/Ice/SysLoggerI.cpp b/cpp/src/Ice/SysLoggerI.cpp
index 0768efc5b77..99e88c7810f 100644
--- a/cpp/src/Ice/SysLoggerI.cpp
+++ b/cpp/src/Ice/SysLoggerI.cpp
@@ -163,5 +163,5 @@ Ice::SysLoggerI::getPrefix()
 Ice::LoggerPtr
 Ice::SysLoggerI::cloneWithPrefix(const string& prefix)
 {
-    return new SysLoggerI(prefix, _facility);
+    return ICE_MAKE_SHARED(SysLoggerI, prefix, _facility);
 }
diff --git a/cpp/src/Ice/SysLoggerI.h b/cpp/src/Ice/SysLoggerI.h
index c83eab0a435..c7ceb99d9a4 100644
--- a/cpp/src/Ice/SysLoggerI.h
+++ b/cpp/src/Ice/SysLoggerI.h
@@ -21,6 +21,7 @@ class SysLoggerI : public Logger, public ::IceUtil::Mutex
 public:
 
     SysLoggerI(const std::string&, const std::string&);
+    SysLoggerI(const std::string&, int);
     ~SysLoggerI();
 
     virtual void print(const std::string&);
@@ -32,8 +33,6 @@ public:
 
 private:
 
-    SysLoggerI(const std::string&, int);
-
     int _facility;
     const std::string _prefix;
 };
diff --git a/cpp/src/Ice/TcpEndpointI.cpp b/cpp/src/Ice/TcpEndpointI.cpp
index 5e744c394bb..b30edcb0be7 100644
--- a/cpp/src/Ice/TcpEndpointI.cpp
+++ b/cpp/src/Ice/TcpEndpointI.cpp
@@ -21,7 +21,9 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(TcpEndpointI* p) { return p; }
+#endif
 
 extern "C"
 {
@@ -62,7 +64,12 @@ IceInternal::TcpEndpointI::TcpEndpointI(const ProtocolInstancePtr& instance, Bas
 EndpointInfoPtr
 IceInternal::TcpEndpointI::getInfo() const
 {
+#ifdef ICE_CPP11_MAPPING
+    TCPEndpointInfoPtr info = make_shared<InfoI<Ice::TCPEndpointInfo>>(
+        dynamic_pointer_cast<TcpEndpointI>(const_pointer_cast<EndpointI>(shared_from_this())));
+#else
     TCPEndpointInfoPtr info = new InfoI<Ice::TCPEndpointInfo>(const_cast<TcpEndpointI*>(this));
+#endif
     fillEndpointInfo(info.get());
     return info;
 }
@@ -70,7 +77,12 @@ IceInternal::TcpEndpointI::getInfo() const
 EndpointInfoPtr
 IceInternal::TcpEndpointI::getWSInfo(const string& resource) const
 {
+#ifdef ICE_CPP11_MAPPING
+    WSEndpointInfoPtr info = make_shared<InfoI<Ice::WSEndpointInfo>>(
+        dynamic_pointer_cast<TcpEndpointI>(const_pointer_cast<EndpointI>(shared_from_this())));
+#else
     WSEndpointInfoPtr info = new InfoI<Ice::WSEndpointInfo>(const_cast<TcpEndpointI*>(this));
+#endif
     fillEndpointInfo(info.get());
     info->resource = resource;
     return info;
@@ -87,11 +99,15 @@ IceInternal::TcpEndpointI::timeout(Int timeout) const
 {
     if(timeout == _timeout)
     {
+#ifdef ICE_CPP11_MAPPING
+        return dynamic_pointer_cast<TcpEndpointI>(const_pointer_cast<EndpointI>(shared_from_this()));
+#else
         return const_cast<TcpEndpointI*>(this);
+#endif
     }
     else
     {
-        return new TcpEndpointI(_instance, _host, _port, _sourceAddr, timeout, _connectionId, _compress);
+        return ICE_MAKE_SHARED(TcpEndpointI, _instance, _host, _port, _sourceAddr, timeout, _connectionId, _compress);
     }
 }
 
@@ -106,11 +122,15 @@ IceInternal::TcpEndpointI::compress(bool compress) const
 {
     if(compress == _compress)
     {
+#ifdef ICE_CPP11_MAPPING
+        return dynamic_pointer_cast<TcpEndpointI>(const_pointer_cast<EndpointI>(shared_from_this()));
+#else
         return const_cast<TcpEndpointI*>(this);
+#endif
     }
     else
     {
-        return new TcpEndpointI(_instance, _host, _port, _sourceAddr, _timeout, _connectionId, compress);
+        return ICE_MAKE_SHARED(TcpEndpointI, _instance, _host, _port, _sourceAddr, _timeout, _connectionId, compress);
     }
 }
 
@@ -123,19 +143,23 @@ IceInternal::TcpEndpointI::datagram() const
 TransceiverPtr
 IceInternal::TcpEndpointI::transceiver() const
 {
-    return 0;
+    return ICE_NULLPTR;
 }
 
 AcceptorPtr
 IceInternal::TcpEndpointI::acceptor(const string&) const
 {
+#ifdef ICE_CPP11_MAPPING
+    return new TcpAcceptor(dynamic_pointer_cast<TcpEndpointI>(const_pointer_cast<EndpointI>(shared_from_this())), _instance, _host, _port);
+#else
     return new TcpAcceptor(const_cast<TcpEndpointI*>(this), _instance, _host, _port);
+#endif
 }
 
 TcpEndpointIPtr
 IceInternal::TcpEndpointI::endpoint(const TcpAcceptorPtr& acceptor) const
 {
-    return new TcpEndpointI(_instance, _host, acceptor->effectivePort(), _sourceAddr, _timeout, _connectionId,
+    return ICE_MAKE_SHARED(TcpEndpointI, _instance, _host, acceptor->effectivePort(), _sourceAddr, _timeout, _connectionId,
                             _compress);
 }
 
@@ -171,7 +195,11 @@ IceInternal::TcpEndpointI::options() const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::TcpEndpointI::operator==(const EndpointI& r) const
+#else
 IceInternal::TcpEndpointI::operator==(const LocalObject& r) const
+#endif
 {
     if(!IPEndpointI::operator==(r))
     {
@@ -198,12 +226,15 @@ IceInternal::TcpEndpointI::operator==(const LocalObject& r) const
     {
         return false;
     }
-
     return true;
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::TcpEndpointI::operator<(const EndpointI& r) const
+#else
 IceInternal::TcpEndpointI::operator<(const LocalObject& r) const
+#endif
 {
     const TcpEndpointI* p = dynamic_cast<const TcpEndpointI*>(&r);
     if(!p)
@@ -330,7 +361,7 @@ IceInternal::TcpEndpointI::createConnector(const Address& address, const Network
 IPEndpointIPtr
 IceInternal::TcpEndpointI::createEndpoint(const string& host, int port, const string& connectionId) const
 {
-    return new TcpEndpointI(_instance, host, port, _sourceAddr, _timeout, connectionId, _compress);
+    return ICE_MAKE_SHARED(TcpEndpointI, _instance, host, port, _sourceAddr, _timeout, connectionId, _compress);
 }
 
 IceInternal::TcpEndpointFactory::TcpEndpointFactory(const ProtocolInstancePtr& instance) : _instance(instance)
@@ -356,7 +387,7 @@ IceInternal::TcpEndpointFactory::protocol() const
 EndpointIPtr
 IceInternal::TcpEndpointFactory::create(vector<string>& args, bool oaEndpoint) const
 {
-    IPEndpointIPtr endpt = new TcpEndpointI(_instance);
+    IPEndpointIPtr endpt = ICE_MAKE_SHARED(TcpEndpointI, _instance);
     endpt->initWithOptions(args, oaEndpoint);
     return endpt;
 }
@@ -364,7 +395,7 @@ IceInternal::TcpEndpointFactory::create(vector<string>& args, bool oaEndpoint) c
 EndpointIPtr
 IceInternal::TcpEndpointFactory::read(BasicStream* s) const
 {
-    return new TcpEndpointI(_instance, s);
+    return ICE_MAKE_SHARED(TcpEndpointI, _instance, s);
 }
 
 void
diff --git a/cpp/src/Ice/TcpEndpointI.h b/cpp/src/Ice/TcpEndpointI.h
index d29498fc181..6c93a1491ec 100644
--- a/cpp/src/Ice/TcpEndpointI.h
+++ b/cpp/src/Ice/TcpEndpointI.h
@@ -41,9 +41,13 @@ public:
     virtual AcceptorPtr acceptor(const std::string&) const;
     virtual std::string options() const;
 
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const EndpointI&) const;
+    virtual bool operator<(const EndpointI&) const;
+#else
     virtual bool operator==(const Ice::LocalObject&) const;
     virtual bool operator<(const Ice::LocalObject&) const;
-
+#endif
     TcpEndpointIPtr endpoint(const TcpAcceptorPtr&) const;
 
     using IPEndpointI::connectionId;
diff --git a/cpp/src/Ice/TcpTransceiver.cpp b/cpp/src/Ice/TcpTransceiver.cpp
index 7ca16363d83..6e744ff4919 100644
--- a/cpp/src/Ice/TcpTransceiver.cpp
+++ b/cpp/src/Ice/TcpTransceiver.cpp
@@ -103,7 +103,7 @@ IceInternal::TcpTransceiver::toDetailedString() const
 Ice::ConnectionInfoPtr
 IceInternal::TcpTransceiver::getInfo() const
 {
-    TCPConnectionInfoPtr info = new TCPConnectionInfo();
+    TCPConnectionInfoPtr info = ICE_MAKE_SHARED(TCPConnectionInfo);
     fillConnectionInfo(info);
     return info;
 }
@@ -111,7 +111,7 @@ IceInternal::TcpTransceiver::getInfo() const
 Ice::ConnectionInfoPtr
 IceInternal::TcpTransceiver::getWSInfo(const Ice::HeaderDict& headers) const
 {
-    WSConnectionInfoPtr info = new WSConnectionInfo();
+    WSConnectionInfoPtr info = ICE_MAKE_SHARED(WSConnectionInfo);
     fillConnectionInfo(info);
     info->headers = headers;
     return info;
diff --git a/cpp/src/Ice/ThreadPool.cpp b/cpp/src/Ice/ThreadPool.cpp
index 0de8b971559..95ca1000e7d 100644
--- a/cpp/src/Ice/ThreadPool.cpp
+++ b/cpp/src/Ice/ThreadPool.cpp
@@ -345,7 +345,7 @@ IceInternal::ThreadPool::ThreadPool(const InstancePtr& instance, const string& p
         const_cast<int&>(_priority) = properties->getPropertyAsInt("Ice.ThreadPriority");
     }
 
-    _workQueue = new ThreadPoolWorkQueue(*this);
+    _workQueue = ICE_MAKE_SHARED(ThreadPoolWorkQueue, *this);
     _selector.initialize(_workQueue.get());
 
     if(_instance->traceLevels()->threadPool >= 1)
@@ -674,7 +674,11 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
             if(_nextHandler != _handlers.end())
             {
                 current._ioCompleted = false;
+#ifdef ICE_CPP11_MAPPING
+                current._handler = dynamic_pointer_cast<EventHandler>(_nextHandler->first->shared_from_this());
+#else
                 current._handler = _nextHandler->first;
+#endif
                 current.operation = _nextHandler->second;
                 ++_nextHandler;
                 thread->setState(ThreadStateInUseForIO);
@@ -726,10 +730,20 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
         {
             current._ioCompleted = false;
 #ifdef ICE_OS_WINRT
+#   ifdef ICE_CPP11_MAPPING
+            current._handler = dynamic_pointer_cast<EventHandler>(
+                _selector.getNextHandler(current.operation, _threadIdleTime)->shared_from_this());
+#   else
             current._handler = _selector.getNextHandler(current.operation, _threadIdleTime);
+#   endif
 #else
+#   ifdef ICE_CPP11_MAPPING
+            current._handler = dynamic_pointer_cast<EventHandler>(_selector.getNextHandler(current.operation,
+                                                current._count, current._error, _threadIdleTime)->shared_from_this());
+#   else
             current._handler = _selector.getNextHandler(current.operation, current._count, current._error,
                                                         _threadIdleTime);
+#   endif
 #endif
         }
         catch(const SelectorTimeoutException&)
@@ -776,10 +790,20 @@ IceInternal::ThreadPool::run(const EventHandlerThreadPtr& thread)
             try
             {
 #ifdef ICE_OS_WINRT
+#   ifdef ICE_CPP11_MAPPING
+                current._handler = dynamic_pointer_cast<EventHandler>(_selector.getNextHandler(
+                                                            current.operation, _serverIdleTime)->shared_from_this());
+#   else
                 current._handler = _selector.getNextHandler(current.operation, _serverIdleTime);
+#   endif
 #else
+#   ifdef ICE_CPP11_MAPPING
+                current._handler = dynamic_pointer_cast<EventHandler>(_selector.getNextHandler(current.operation,
+                                                current._count, current._error, _serverIdleTime)->shared_from_this());
+#   else
                 current._handler = _selector.getNextHandler(current.operation, current._count, current._error,
-                                                            _serverIdleTime);
+                                            _serverIdleTime);
+#   endif
 #endif
             }
             catch(const SelectorTimeoutException&)
diff --git a/cpp/src/Ice/ThreadPool.h b/cpp/src/Ice/ThreadPool.h
index f97ff363f1b..c6db0465bee 100644
--- a/cpp/src/Ice/ThreadPool.h
+++ b/cpp/src/Ice/ThreadPool.h
@@ -35,7 +35,7 @@ namespace IceInternal
 class ThreadPoolCurrent;
 
 class ThreadPoolWorkQueue;
-typedef IceUtil::Handle<ThreadPoolWorkQueue> ThreadPoolWorkQueuePtr;
+ICE_DEFINE_PTR(ThreadPoolWorkQueuePtr, ThreadPoolWorkQueue);
 
 class ThreadPoolWorkItem : virtual public IceUtil::Shared
 {
diff --git a/cpp/src/Ice/TraceUtil.cpp b/cpp/src/Ice/TraceUtil.cpp
index c0c19e7a22b..19f672b1459 100644
--- a/cpp/src/Ice/TraceUtil.cpp
+++ b/cpp/src/Ice/TraceUtil.cpp
@@ -73,21 +73,21 @@ printRequestHeader(ostream& s, BasicStream& stream)
     Byte mode;
     stream.read(mode);
     s << "\nmode = " << static_cast<int>(mode) << ' ';
-    switch(mode)
+    switch(static_cast<OperationMode>(mode))
     {
-        case Normal:
+        case ICE_ENUM(OperationMode, Normal):
         {
             s << "(normal)";
             break;
         }
 
-        case Nonmutating:
+        case ICE_ENUM(OperationMode, Nonmutating):
         {
             s << "(nonmutating)";
             break;
         }
 
-        case Idempotent:
+        case ICE_ENUM(OperationMode, Idempotent):
         {
             s << "(idempotent)";
             break;
diff --git a/cpp/src/Ice/UdpEndpointI.cpp b/cpp/src/Ice/UdpEndpointI.cpp
index 019ff02a368..cffe27fb7ec 100644
--- a/cpp/src/Ice/UdpEndpointI.cpp
+++ b/cpp/src/Ice/UdpEndpointI.cpp
@@ -22,7 +22,9 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(UdpEndpointI* p) { return p; }
+#endif
 
 extern "C"
 {
@@ -76,7 +78,12 @@ IceInternal::UdpEndpointI::UdpEndpointI(const ProtocolInstancePtr& instance, Bas
 EndpointInfoPtr
 IceInternal::UdpEndpointI::getInfo() const
 {
+#ifdef ICE_CPP11_MAPPING
+    Ice::UDPEndpointInfoPtr info = make_shared<InfoI<Ice::UDPEndpointInfo>>(
+        dynamic_pointer_cast<UdpEndpointI>(const_pointer_cast<EndpointI>(shared_from_this())));
+#else
     Ice::UDPEndpointInfoPtr info = new InfoI<Ice::UDPEndpointInfo>(const_cast<UdpEndpointI*>(this));
+#endif
     fillEndpointInfo(info.get());
     return info;
 }
@@ -90,7 +97,11 @@ IceInternal::UdpEndpointI::timeout() const
 EndpointIPtr
 IceInternal::UdpEndpointI::timeout(Int) const
 {
+#ifdef ICE_CPP11_MAPPING
+    return const_pointer_cast<EndpointI>(shared_from_this());
+#else
     return const_cast<UdpEndpointI*>(this);
+#endif
 }
 
 bool
@@ -104,12 +115,16 @@ IceInternal::UdpEndpointI::compress(bool compress) const
 {
     if(compress == _compress)
     {
+#ifdef ICE_CPP11_MAPPING
+        return const_pointer_cast<EndpointI>(shared_from_this());
+#else
         return const_cast<UdpEndpointI*>(this);
+#endif
     }
     else
     {
-        return new UdpEndpointI(_instance, _host, _port, _sourceAddr, _mcastInterface, _mcastTtl, _connect,
-                                _connectionId, compress);
+        return ICE_MAKE_SHARED(UdpEndpointI, _instance, _host, _port, _sourceAddr, _mcastInterface, _mcastTtl,
+                               _connect, _connectionId, compress);
     }
 }
 
@@ -122,7 +137,12 @@ IceInternal::UdpEndpointI::datagram() const
 TransceiverPtr
 IceInternal::UdpEndpointI::transceiver() const
 {
+#ifdef ICE_CPP11_MAPPING
+    return new UdpTransceiver(dynamic_pointer_cast<UdpEndpointI>(const_pointer_cast<EndpointI>(shared_from_this())),
+                              _instance, _host, _port, _mcastInterface, _connect);    
+#else
     return new UdpTransceiver(const_cast<UdpEndpointI*>(this), _instance, _host, _port, _mcastInterface, _connect);
+#endif
 }
 
 AcceptorPtr
@@ -134,8 +154,8 @@ IceInternal::UdpEndpointI::acceptor(const string&) const
 UdpEndpointIPtr
 IceInternal::UdpEndpointI::endpoint(const UdpTransceiverPtr& transceiver) const
 {
-    return new UdpEndpointI(_instance, _host, transceiver->effectivePort(), _sourceAddr, _mcastInterface, _mcastTtl,
-                            _connect, _connectionId, _compress);
+    return ICE_MAKE_SHARED(UdpEndpointI, _instance, _host, transceiver->effectivePort(), _sourceAddr, _mcastInterface,
+                           _mcastTtl, _connect, _connectionId, _compress);
 }
 
 string
@@ -175,7 +195,11 @@ IceInternal::UdpEndpointI::options() const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::UdpEndpointI::operator==(const EndpointI& r) const
+#else
 IceInternal::UdpEndpointI::operator==(const LocalObject& r) const
+#endif
 {
     if(!IPEndpointI::operator==(r))
     {
@@ -217,7 +241,11 @@ IceInternal::UdpEndpointI::operator==(const LocalObject& r) const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::UdpEndpointI::operator<(const EndpointI& r) const
+#else
 IceInternal::UdpEndpointI::operator<(const LocalObject& r) const
+#endif
 {
     const UdpEndpointI* p = dynamic_cast<const UdpEndpointI*>(&r);
     if(!p)
@@ -406,8 +434,8 @@ IceInternal::UdpEndpointI::createConnector(const Address& address, const Network
 IPEndpointIPtr
 IceInternal::UdpEndpointI::createEndpoint(const string& host, int port, const string& connectionId) const
 {
-    return new UdpEndpointI(_instance, host, port, _sourceAddr, _mcastInterface, _mcastTtl, _connect, connectionId,
-                            _compress);
+    return ICE_MAKE_SHARED(UdpEndpointI, _instance, host, port, _sourceAddr, _mcastInterface, _mcastTtl, _connect,
+                           connectionId, _compress);
 }
 
 IceInternal::UdpEndpointFactory::UdpEndpointFactory(const ProtocolInstancePtr& instance) : _instance(instance)
@@ -433,7 +461,7 @@ IceInternal::UdpEndpointFactory::protocol() const
 EndpointIPtr
 IceInternal::UdpEndpointFactory::create(vector<string>& args, bool oaEndpoint) const
 {
-    IPEndpointIPtr endpt = new UdpEndpointI(_instance);
+    IPEndpointIPtr endpt = ICE_MAKE_SHARED(UdpEndpointI, _instance);
     endpt->initWithOptions(args, oaEndpoint);
     return endpt;
 }
@@ -441,7 +469,7 @@ IceInternal::UdpEndpointFactory::create(vector<string>& args, bool oaEndpoint) c
 EndpointIPtr
 IceInternal::UdpEndpointFactory::read(BasicStream* s) const
 {
-    return new UdpEndpointI(_instance, s);
+    return ICE_MAKE_SHARED(UdpEndpointI, _instance, s);
 }
 
 void
diff --git a/cpp/src/Ice/UdpEndpointI.h b/cpp/src/Ice/UdpEndpointI.h
index 30ab27fb51e..66913066c15 100644
--- a/cpp/src/Ice/UdpEndpointI.h
+++ b/cpp/src/Ice/UdpEndpointI.h
@@ -39,9 +39,14 @@ public:
     virtual AcceptorPtr acceptor(const std::string&) const;
     virtual std::string options() const;
 
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const EndpointI&) const;
+    virtual bool operator<(const EndpointI&) const;
+#else
     virtual bool operator==(const Ice::LocalObject&) const;
     virtual bool operator<(const Ice::LocalObject&) const;
-
+#endif
+    
     UdpEndpointIPtr endpoint(const UdpTransceiverPtr&) const;
 
     using IPEndpointI::connectionId;
diff --git a/cpp/src/Ice/UdpTransceiver.cpp b/cpp/src/Ice/UdpTransceiver.cpp
index b1b3c8562b6..072fbe52da1 100644
--- a/cpp/src/Ice/UdpTransceiver.cpp
+++ b/cpp/src/Ice/UdpTransceiver.cpp
@@ -821,7 +821,7 @@ IceInternal::UdpTransceiver::toDetailedString() const
 Ice::ConnectionInfoPtr
 IceInternal::UdpTransceiver::getInfo() const
 {
-    Ice::UDPConnectionInfoPtr info = new Ice::UDPConnectionInfo();
+    Ice::UDPConnectionInfoPtr info = ICE_MAKE_SHARED(Ice::UDPConnectionInfo);
 #if defined(ICE_OS_WINRT)
     if(isMulticast(_addr) || isAddressValid(_mcastAddr))
     {
diff --git a/cpp/src/Ice/Value.cpp b/cpp/src/Ice/Value.cpp
new file mode 100644
index 00000000000..b791bd59d3d
--- /dev/null
+++ b/cpp/src/Ice/Value.cpp
@@ -0,0 +1,69 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#include <Ice/Value.h>
+#include <Ice/Stream.h>
+#include <Ice/LocalException.h>
+
+#ifdef ICE_CPP11_MAPPING
+
+using namespace std;
+using namespace Ice;
+using namespace IceInternal;
+
+void
+Ice::Value::ice_preMarshal()
+{
+}
+
+void
+Ice::Value::ice_postUnmarshal()
+{
+}
+
+void
+Ice::Value::__write(IceInternal::BasicStream* os) const
+{
+    os->startWriteObject(0);
+    __writeImpl(os);
+    os->endWriteObject();
+}
+
+void
+Ice::Value::__read(IceInternal::BasicStream* is)
+{
+   is->startReadObject();
+   __readImpl(is);
+   is->endReadObject(false);
+}
+
+namespace
+{
+
+const string __Ice__Object_ids[] =
+{
+    "::Ice::Object"
+};
+
+}
+
+const string&
+Ice::Value::ice_id() const
+{
+    return __Ice__Object_ids[0];
+}
+
+
+const string&
+Ice::Value::ice_staticId()
+{
+    return __Ice__Object_ids[0];
+}
+
+#endif
diff --git a/cpp/src/Ice/VirtualShared.h b/cpp/src/Ice/VirtualShared.h
new file mode 100644
index 00000000000..4de4d0b17bc
--- /dev/null
+++ b/cpp/src/Ice/VirtualShared.h
@@ -0,0 +1,31 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2015 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICE_VIRTUAL_SHARED_H
+#define ICE_VIRTUAL_SHARED_H
+
+#include <IceUtil/Config.h>
+
+#ifdef ICE_CPP11_MAPPING
+
+namespace IceInternal
+{
+
+class VirtualShared : public ::std::enable_shared_from_this<VirtualShared>
+{
+public:
+
+    virtual ~VirtualShared() = default;
+};
+
+}
+
+#endif
+
+#endif
diff --git a/cpp/src/Ice/WSEndpoint.cpp b/cpp/src/Ice/WSEndpoint.cpp
index d23b952b6b5..c1f9c520b18 100644
--- a/cpp/src/Ice/WSEndpoint.cpp
+++ b/cpp/src/Ice/WSEndpoint.cpp
@@ -20,15 +20,20 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceInternal::upCast(WSEndpoint* p) { return p; }
+#endif
 
 IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const EndpointIPtr& del, const string& res) :
-    _instance(instance), _delegate(IPEndpointIPtr::dynamicCast(del)), _resource(res)
+    _instance(instance),
+    _delegate(ICE_DYNAMIC_CAST(IPEndpointI, del)),
+    _resource(res)
 {
 }
 
 IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& inst, const EndpointIPtr& del, vector<string>& args) :
-    _instance(inst), _delegate(IPEndpointIPtr::dynamicCast(del))
+    _instance(inst), 
+    _delegate(ICE_DYNAMIC_CAST(IPEndpointI, del))
 {
     initWithOptions(args);
 
@@ -39,7 +44,8 @@ IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& inst, const Endpo
 }
 
 IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const EndpointIPtr& del, BasicStream* s) :
-    _instance(instance), _delegate(IPEndpointIPtr::dynamicCast(del))
+    _instance(instance),
+    _delegate(ICE_DYNAMIC_CAST(IPEndpointI, del))
 {
     s->read(const_cast<string&>(_resource), false);
 }
@@ -47,8 +53,13 @@ IceInternal::WSEndpoint::WSEndpoint(const ProtocolInstancePtr& instance, const E
 Ice::EndpointInfoPtr
 IceInternal::WSEndpoint::getInfo() const
 {
+#ifdef ICE_CPP11_MAPPING
+    assert(dynamic_pointer_cast<WSEndpointDelegate>(_delegate));
+    return dynamic_pointer_cast<WSEndpointDelegate>(_delegate)->getWSInfo(_resource);
+#else
     assert(dynamic_cast<WSEndpointDelegate*>(_delegate.get()));
     return dynamic_cast<WSEndpointDelegate*>(_delegate.get())->getWSInfo(_resource);
+#endif
 }
 
 Ice::Short
@@ -83,11 +94,15 @@ IceInternal::WSEndpoint::timeout(Int timeout) const
 {
     if(timeout == _delegate->timeout())
     {
+#ifdef ICE_CPP11_MAPPING
+        return const_pointer_cast<EndpointI>(shared_from_this());
+#else
         return const_cast<WSEndpoint*>(this);
+#endif
     }
     else
     {
-        return new WSEndpoint(_instance, _delegate->timeout(timeout), _resource);
+        return ICE_MAKE_SHARED(WSEndpoint, _instance, _delegate->timeout(timeout), _resource);
     }
 }
 
@@ -102,11 +117,15 @@ IceInternal::WSEndpoint::connectionId(const string& connectionId) const
 {
     if(connectionId == _delegate->connectionId())
     {
+#ifdef ICE_CPP11_MAPPING
+        return const_pointer_cast<EndpointI>(shared_from_this());
+#else
         return const_cast<WSEndpoint*>(this);
+#endif
     }
     else
     {
-        return new WSEndpoint(_instance, _delegate->connectionId(connectionId), _resource);
+        return ICE_MAKE_SHARED(WSEndpoint, _instance, _delegate->connectionId(connectionId), _resource);
     }
 }
 
@@ -121,11 +140,15 @@ IceInternal::WSEndpoint::compress(bool compress) const
 {
     if(compress == _delegate->compress())
     {
+#ifdef ICE_CPP11_MAPPING
+        return const_pointer_cast<EndpointI>(shared_from_this());
+#else
         return const_cast<WSEndpoint*>(this);
+#endif
     }
     else
     {
-        return new WSEndpoint(_instance, _delegate->compress(compress), _resource);
+        return ICE_MAKE_SHARED(WSEndpoint, _instance, _delegate->compress(compress), _resource);
     }
 }
 
@@ -184,21 +207,26 @@ IceInternal::WSEndpoint::connectors_async(Ice::EndpointSelectionType selType,
         const int _port;
         const string _resource;
     };
-    _delegate->connectors_async(selType, new CallbackI(callback, _instance, _delegate->host(), _delegate->port(),
-                                                       _resource));
+    _delegate->connectors_async(selType, ICE_MAKE_SHARED(CallbackI, callback, _instance, _delegate->host(),
+                                                         _delegate->port(), _resource));
 }
 
 AcceptorPtr
 IceInternal::WSEndpoint::acceptor(const string& adapterName) const
 {
     AcceptorPtr delAcc = _delegate->acceptor(adapterName);
+#ifdef ICE_CPP11_MAPPING
+    return new WSAcceptor(dynamic_pointer_cast<WSEndpoint>(const_pointer_cast<EndpointI>(shared_from_this())), 
+                          _instance, delAcc);
+#else
     return new WSAcceptor(const_cast<WSEndpoint*>(this), _instance, delAcc);
+#endif
 }
 
 WSEndpointPtr
 IceInternal::WSEndpoint::endpoint(const EndpointIPtr& delEndp) const
 {
-    return new WSEndpoint(_instance, delEndp, _resource);
+    return ICE_MAKE_SHARED(WSEndpoint, _instance, delEndp, _resource);
 }
 
 vector<EndpointIPtr>
@@ -207,7 +235,13 @@ IceInternal::WSEndpoint::expand() const
     vector<EndpointIPtr> endps = _delegate->expand();
     for(vector<EndpointIPtr>::iterator p = endps.begin(); p != endps.end(); ++p)
     {
+#ifdef ICE_CPP11_MAPPING
+        *p = p->get() == _delegate.get() ? 
+            dynamic_pointer_cast<WSEndpoint>(const_pointer_cast<EndpointI>(shared_from_this())) : 
+            make_shared<WSEndpoint>(_instance, *p, _resource);
+#else
         *p = p->get() == _delegate.get() ? const_cast<WSEndpoint*>(this) : new WSEndpoint(_instance, *p, _resource);
+#endif
     }
     return endps;
 }
@@ -265,11 +299,15 @@ IceInternal::WSEndpoint::options() const
 EndpointIPtr
 IceInternal::WSEndpoint::delegate() const
 {
-    return EndpointIPtr::dynamicCast(_delegate);
+    return ICE_DYNAMIC_CAST(EndpointI, _delegate);
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::WSEndpoint::operator==(const EndpointI& r) const
+#else
 IceInternal::WSEndpoint::operator==(const Ice::LocalObject& r) const
+#endif
 {
     const WSEndpoint* p = dynamic_cast<const WSEndpoint*>(&r);
     if(!p)
@@ -296,7 +334,11 @@ IceInternal::WSEndpoint::operator==(const Ice::LocalObject& r) const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceInternal::WSEndpoint::operator<(const EndpointI& r) const
+#else
 IceInternal::WSEndpoint::operator<(const Ice::LocalObject& r) const
+#endif
 {
     const WSEndpoint* p = dynamic_cast<const WSEndpoint*>(&r);
     if(!p)
@@ -385,13 +427,13 @@ IceInternal::WSEndpointFactory::protocol() const
 EndpointIPtr
 IceInternal::WSEndpointFactory::create(vector<string>& args, bool oaEndpoint) const
 {
-    return new WSEndpoint(_instance, _delegate->create(args, oaEndpoint), args);
+    return ICE_MAKE_SHARED(WSEndpoint, _instance, _delegate->create(args, oaEndpoint), args);
 }
 
 EndpointIPtr
 IceInternal::WSEndpointFactory::read(BasicStream* s) const
 {
-    return new WSEndpoint(_instance, _delegate->read(s), s);
+    return ICE_MAKE_SHARED(WSEndpoint, _instance, _delegate->read(s), s);
 }
 
 void
diff --git a/cpp/src/Ice/WSEndpoint.h b/cpp/src/Ice/WSEndpoint.h
index 6fb08211a84..a5f4a89d09a 100644
--- a/cpp/src/Ice/WSEndpoint.h
+++ b/cpp/src/Ice/WSEndpoint.h
@@ -65,8 +65,13 @@ public:
     EndpointIPtr delegate() const;
     WSEndpointPtr endpoint(const EndpointIPtr&) const;
 
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const EndpointI&) const;
+    virtual bool operator<(const EndpointI&) const;
+#else
     virtual bool operator==(const Ice::LocalObject&) const;
     virtual bool operator<(const Ice::LocalObject&) const;
+#endif
 
 protected:
 
diff --git a/cpp/src/IceBox/.depend.mak b/cpp/src/IceBox/.depend.mak
index 2d4c6b79cb0..78e071ebc4a 100755
--- a/cpp/src/IceBox/.depend.mak
+++ b/cpp/src/IceBox/.depend.mak
@@ -28,6 +28,7 @@ Service.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -36,6 +37,7 @@ Service.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -72,7 +74,7 @@ Service.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -86,6 +88,7 @@ Service.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -97,7 +100,6 @@ Service.obj: \
     "$(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" \
@@ -120,7 +122,6 @@ Service.obj: \
     "$(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" \
@@ -157,6 +158,7 @@ ServiceManagerI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -165,6 +167,7 @@ ServiceManagerI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -201,7 +204,7 @@ ServiceManagerI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -215,6 +218,7 @@ ServiceManagerI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -226,7 +230,6 @@ ServiceManagerI.obj: \
     "$(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" \
@@ -249,7 +252,6 @@ ServiceManagerI.obj: \
     "$(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" \
@@ -298,6 +300,7 @@ Admin.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -306,6 +309,7 @@ Admin.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -346,7 +350,7 @@ Admin.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -360,6 +364,7 @@ Admin.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -371,7 +376,6 @@ Admin.obj: \
     "$(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" \
@@ -393,7 +397,6 @@ Admin.obj: \
     "$(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" \
@@ -421,6 +424,7 @@ IceBox.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -429,6 +433,7 @@ IceBox.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -463,7 +468,7 @@ IceBox.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -472,13 +477,13 @@ IceBox.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\SliceChecksumDict.h" \
@@ -505,6 +510,7 @@ Exception.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -513,6 +519,7 @@ Exception.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -547,7 +554,7 @@ Exception.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -556,13 +563,13 @@ Exception.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\PropertiesF.h" \
     "$(includedir)\Ice\SliceChecksumDict.h" \
diff --git a/cpp/src/IceDB/.depend.mak b/cpp/src/IceDB/.depend.mak
index ee379870c87..c19a4b2cb26 100755..100644
--- a/cpp/src/IceDB/.depend.mak
+++ b/cpp/src/IceDB/.depend.mak
@@ -25,6 +25,7 @@ IceDB.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -33,6 +34,7 @@ IceDB.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -60,7 +62,7 @@ IceDB.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
diff --git a/cpp/src/IceDiscovery/.depend.mak b/cpp/src/IceDiscovery/.depend.mak
index f948e02cb91..23f0d4305e8 100755
--- a/cpp/src/IceDiscovery/.depend.mak
+++ b/cpp/src/IceDiscovery/.depend.mak
@@ -18,6 +18,7 @@ LocatorI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -26,6 +27,7 @@ LocatorI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -60,7 +62,7 @@ LocatorI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -69,6 +71,7 @@ LocatorI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -76,8 +79,7 @@ LocatorI.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
+    "$(includedir)\Ice\Process.h" \
     "LookupI.h" \
     "IceDiscovery.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -111,6 +113,7 @@ LookupI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -119,6 +122,7 @@ LookupI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -153,7 +157,7 @@ LookupI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -169,6 +173,7 @@ LookupI.obj: \
     "$(includedir)\Ice\Communicator.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
@@ -194,8 +199,7 @@ LookupI.obj: \
     "$(includedir)\Ice\Locator.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
+    "$(includedir)\Ice\Process.h" \
 
 PluginI.obj: \
 	PluginI.cpp \
@@ -232,6 +236,7 @@ PluginI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -239,6 +244,7 @@ PluginI.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -267,7 +273,7 @@ PluginI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -280,6 +286,7 @@ PluginI.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -291,7 +298,6 @@ PluginI.obj: \
     "$(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" \
@@ -313,7 +319,6 @@ PluginI.obj: \
     "$(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" \
@@ -341,6 +346,7 @@ IceDiscovery.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -349,6 +355,7 @@ IceDiscovery.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -383,7 +390,7 @@ IceDiscovery.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -392,13 +399,13 @@ IceDiscovery.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
diff --git a/cpp/src/IceDiscovery/LocatorI.cpp b/cpp/src/IceDiscovery/LocatorI.cpp
index 09e70a0f9b3..196c1dcaa5d 100644
--- a/cpp/src/IceDiscovery/LocatorI.cpp
+++ b/cpp/src/IceDiscovery/LocatorI.cpp
@@ -26,7 +26,7 @@ LocatorRegistryI::LocatorRegistryI(const Ice::CommunicatorPtr& com) :
 void 
 LocatorRegistryI::setAdapterDirectProxy_async(const AMD_LocatorRegistry_setAdapterDirectProxyPtr& cb, 
                                               const std::string& adapterId, 
-                                              const ObjectPrx& proxy, 
+                                              const ObjectPrxPtr& proxy, 
                                               const Current&)
 {
     Lock sync(*this);
@@ -46,7 +46,7 @@ LocatorRegistryI::setReplicatedAdapterDirectProxy_async(
     const AMD_LocatorRegistry_setReplicatedAdapterDirectProxyPtr& cb,
     const std::string& adapterId,
     const std::string& replicaGroupId,
-    const ObjectPrx& proxy, 
+    const ObjectPrxPtr& proxy, 
     const Current&)
 {
     Lock sync(*this);
@@ -79,13 +79,13 @@ LocatorRegistryI::setReplicatedAdapterDirectProxy_async(
 void
 LocatorRegistryI::setServerProcessProxy_async(const AMD_LocatorRegistry_setServerProcessProxyPtr& cb, 
                                               const std::string&, 
-                                              const ProcessPrx&,
+                                              const ProcessPrxPtr&,
                                               const Current&)
 {
     cb->ice_response();
 }
 
-Ice::ObjectPrx 
+Ice::ObjectPrxPtr 
 LocatorRegistryI::findObject(const Ice::Identity& id) const
 {
     Lock sync(*this);
@@ -94,7 +94,7 @@ LocatorRegistryI::findObject(const Ice::Identity& id) const
         return 0;
     }
 
-    Ice::ObjectPrx prx = _wellKnownProxy->ice_identity(id);
+    Ice::ObjectPrxPtr prx = _wellKnownProxy->ice_identity(id);
 
     vector<string> adapterIds;
     for(map<string, set<string> >::const_iterator p = _replicaGroups.begin(); p != _replicaGroups.end(); ++p)
@@ -112,7 +112,7 @@ LocatorRegistryI::findObject(const Ice::Identity& id) const
 
     if(adapterIds.empty())
     {
-        for(map<string, Ice::ObjectPrx>::const_iterator p = _adapters.begin(); p != _adapters.end(); ++p)
+        for(map<string, Ice::ObjectPrxPtr>::const_iterator p = _adapters.begin(); p != _adapters.end(); ++p)
         {
             try
             {
@@ -135,12 +135,12 @@ LocatorRegistryI::findObject(const Ice::Identity& id) const
     return prx->ice_adapterId(adapterIds[0]);
 }
 
-Ice::ObjectPrx 
+Ice::ObjectPrxPtr 
 LocatorRegistryI::findAdapter(const string& adapterId, bool& isReplicaGroup) const
 {
     Lock sync(*this);
 
-    map<string, Ice::ObjectPrx>::const_iterator p = _adapters.find(adapterId);
+    map<string, Ice::ObjectPrxPtr>::const_iterator p = _adapters.find(adapterId);
     if(p != _adapters.end())
     {
         isReplicaGroup = false;
@@ -151,10 +151,10 @@ LocatorRegistryI::findAdapter(const string& adapterId, bool& isReplicaGroup) con
     if(q != _replicaGroups.end())
     {
         Ice::EndpointSeq endpoints;
-        Ice::ObjectPrx prx;
+        Ice::ObjectPrxPtr prx;
         for(set<string>::const_iterator r = q->second.begin(); r != q->second.end(); ++r)
         {
-            map<string, Ice::ObjectPrx>::const_iterator s = _adapters.find(*r);
+            map<string, Ice::ObjectPrxPtr>::const_iterator s = _adapters.find(*r);
             if(s == _adapters.end())
             {
                 continue; // TODO: Inconsistency
@@ -180,7 +180,7 @@ LocatorRegistryI::findAdapter(const string& adapterId, bool& isReplicaGroup) con
     return 0;
 }
 
-LocatorI::LocatorI(const LookupIPtr& lookup, const LocatorRegistryPrx& registry) : _lookup(lookup), _registry(registry)
+LocatorI::LocatorI(const LookupIPtr& lookup, const LocatorRegistryPrxPtr& registry) : _lookup(lookup), _registry(registry)
 {
 }
 
@@ -200,7 +200,7 @@ LocatorI::findAdapterById_async(const AMD_Locator_findAdapterByIdPtr& cb,
     _lookup->findAdapter(cb, adapterId);
 }
 
-LocatorRegistryPrx 
+LocatorRegistryPrxPtr 
 LocatorI::getRegistry(const Current&) const
 {
     return _registry;
diff --git a/cpp/src/IceDiscovery/LocatorI.h b/cpp/src/IceDiscovery/LocatorI.h
index 6b3428b15c9..230d8c4e7c9 100644
--- a/cpp/src/IceDiscovery/LocatorI.h
+++ b/cpp/src/IceDiscovery/LocatorI.h
@@ -26,36 +26,36 @@ public:
     
     virtual void 
     setAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setAdapterDirectProxyPtr&, const std::string&, 
-                                const Ice::ObjectPrx&, const Ice::Current&);
+                                const Ice::ObjectPrxPtr&, const Ice::Current&);
 
     virtual void
     setReplicatedAdapterDirectProxy_async(const Ice::AMD_LocatorRegistry_setReplicatedAdapterDirectProxyPtr&,
-                                          const std::string&, const std::string&, const Ice::ObjectPrx&, 
+                                          const std::string&, const std::string&, const Ice::ObjectPrxPtr&, 
                                           const Ice::Current&);
 
     virtual void 
     setServerProcessProxy_async(const Ice::AMD_LocatorRegistry_setServerProcessProxyPtr&, const std::string&, 
-                                const Ice::ProcessPrx&, const Ice::Current&);
+                                const Ice::ProcessPrxPtr&, const Ice::Current&);
 
-    Ice::ObjectPrx findObject(const Ice::Identity&) const;
-    Ice::ObjectPrx findAdapter(const std::string&, bool&) const;
+    Ice::ObjectPrxPtr findObject(const Ice::Identity&) const;
+    Ice::ObjectPrxPtr findAdapter(const std::string&, bool&) const;
 
 private:
 
-    const Ice::ObjectPrx _wellKnownProxy;
-    std::map<std::string, Ice::ObjectPrx> _adapters;
+    const Ice::ObjectPrxPtr _wellKnownProxy;
+    std::map<std::string, Ice::ObjectPrxPtr> _adapters;
     std::map<std::string, std::set<std::string> > _replicaGroups;
 };
-typedef IceInternal::Handle<LocatorRegistryI> LocatorRegistryIPtr;
+ICE_DEFINE_PTR(LocatorRegistryIPtr, LocatorRegistryI);
 
 class LookupI;
-typedef IceInternal::Handle<LookupI> LookupIPtr;
+ICE_DEFINE_PTR(LookupIPtr, LookupI);
 
 class LocatorI : public Ice::Locator
 {
 public:
 
-    LocatorI(const LookupIPtr&, const Ice::LocatorRegistryPrx&);
+    LocatorI(const LookupIPtr&, const Ice::LocatorRegistryPrxPtr&);
 
     virtual void 
     findObjectById_async(const Ice::AMD_Locator_findObjectByIdPtr&, const Ice::Identity&, 
@@ -65,12 +65,12 @@ public:
     findAdapterById_async(const Ice::AMD_Locator_findAdapterByIdPtr&, const std::string&, 
                           const Ice::Current&) const;
 
-    virtual Ice::LocatorRegistryPrx getRegistry(const Ice::Current&) const;
+    virtual Ice::LocatorRegistryPrxPtr getRegistry(const Ice::Current&) const;
 
 private:
     
     LookupIPtr _lookup;
-    Ice::LocatorRegistryPrx _registry;
+    Ice::LocatorRegistryPrxPtr _registry;
 };
 
 };
diff --git a/cpp/src/IceDiscovery/LookupI.cpp b/cpp/src/IceDiscovery/LookupI.cpp
index c1778a6eb92..54835ed4de0 100644
--- a/cpp/src/IceDiscovery/LookupI.cpp
+++ b/cpp/src/IceDiscovery/LookupI.cpp
@@ -36,7 +36,7 @@ AdapterRequest::retry()
 }
 
 bool
-AdapterRequest::response(const Ice::ObjectPrx& proxy, bool isReplicaGroup)
+AdapterRequest::response(const Ice::ObjectPrxPtr& proxy, bool isReplicaGroup)
 {
     if(isReplicaGroup)
     {
@@ -54,7 +54,7 @@ AdapterRequest::response(const Ice::ObjectPrx& proxy, bool isReplicaGroup)
 }
 
 void
-AdapterRequest::finished(const Ice::ObjectPrx& proxy)
+AdapterRequest::finished(const Ice::ObjectPrxPtr& proxy)
 {
     if(proxy || _proxies.empty())
     {
@@ -68,8 +68,8 @@ AdapterRequest::finished(const Ice::ObjectPrx& proxy)
     }
 
     Ice::EndpointSeq endpoints;
-    Ice::ObjectPrx prx;
-    for(vector<Ice::ObjectPrx>::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p)
+    Ice::ObjectPrxPtr prx;
+    for(vector<Ice::ObjectPrxPtr>::const_iterator p = _proxies.begin(); p != _proxies.end(); ++p)
     {
         if(!prx)
         {
@@ -88,7 +88,7 @@ AdapterRequest::runTimerTask()
 }
 
 void
-ObjectRequest::response(const Ice::ObjectPrx& proxy)
+ObjectRequest::response(const Ice::ObjectPrxPtr& proxy)
 {
     finished(proxy);
 }
@@ -99,7 +99,7 @@ ObjectRequest::runTimerTask()
     _lookup->objectRequestTimedOut(this);
 }
 
-LookupI::LookupI(const LocatorRegistryIPtr& registry, const LookupPrx& lookup, const Ice::PropertiesPtr& properties) :
+LookupI::LookupI(const LocatorRegistryIPtr& registry, const LookupPrxPtr& lookup, const Ice::PropertiesPtr& properties) :
     _registry(registry),
     _lookup(lookup),
     _timeout(IceUtil::Time::milliSeconds(properties->getPropertyAsIntWithDefault("IceDiscovery.Timeout", 300))),
@@ -147,7 +147,7 @@ LookupI::findObjectById(const string& domainId, const Ice::Identity& id, const I
         return; // Ignore.
     }
 
-    Ice::ObjectPrx proxy = _registry->findObject(id);
+    Ice::ObjectPrxPtr proxy = _registry->findObject(id);
     if(proxy)
     {
         //
@@ -174,7 +174,7 @@ LookupI::findAdapterById(const string& domainId, const std::string& adapterId,
     }
 
     bool isReplicaGroup;
-    Ice::ObjectPrx proxy = _registry->findAdapter(adapterId, isReplicaGroup);
+    Ice::ObjectPrxPtr proxy = _registry->findAdapter(adapterId, isReplicaGroup);
     if(proxy)
     {
         //
@@ -242,7 +242,7 @@ LookupI::findAdapter(const Ice::AMD_Locator_findAdapterByIdPtr& cb, const std::s
 }
 
 void
-LookupI::foundObject(const Ice::Identity& id, const Ice::ObjectPrx& proxy)
+LookupI::foundObject(const Ice::Identity& id, const Ice::ObjectPrxPtr& proxy)
 {
     Lock sync(*this);
     map<Ice::Identity, ObjectRequestPtr>::iterator p = _objectRequests.find(id);
@@ -257,7 +257,7 @@ LookupI::foundObject(const Ice::Identity& id, const Ice::ObjectPrx& proxy)
 }
 
 void
-LookupI::foundAdapter(const std::string& adapterId, const Ice::ObjectPrx& proxy, bool isReplicaGroup)
+LookupI::foundAdapter(const std::string& adapterId, const Ice::ObjectPrxPtr& proxy, bool isReplicaGroup)
 {
     Lock sync(*this);
     map<string, AdapterRequestPtr>::iterator p = _adapterRequests.find(adapterId);
@@ -334,13 +334,13 @@ LookupReplyI::LookupReplyI(const LookupIPtr& lookup) : _lookup(lookup)
 }
 
 void
-LookupReplyI::foundObjectById(const Ice::Identity& id, const Ice::ObjectPrx& proxy, const Ice::Current&)
+LookupReplyI::foundObjectById(const Ice::Identity& id, const Ice::ObjectPrxPtr& proxy, const Ice::Current&)
 {
     _lookup->foundObject(id, proxy);
 }
 
 void
-LookupReplyI::foundAdapterById(const std::string& adapterId, const Ice::ObjectPrx& proxy, bool isReplicaGroup,
+LookupReplyI::foundAdapterById(const std::string& adapterId, const Ice::ObjectPrxPtr& proxy, bool isReplicaGroup,
                                const Ice::Current&)
 {
     _lookup->foundAdapter(adapterId, proxy, isReplicaGroup);
diff --git a/cpp/src/IceDiscovery/LookupI.h b/cpp/src/IceDiscovery/LookupI.h
index 145da1d5670..fd854167fb0 100644
--- a/cpp/src/IceDiscovery/LookupI.h
+++ b/cpp/src/IceDiscovery/LookupI.h
@@ -54,7 +54,7 @@ public:
         return _callbacks.size() == 1;
     }
 
-    virtual void finished(const Ice::ObjectPrx& proxy)
+    virtual void finished(const Ice::ObjectPrxPtr& proxy)
     {
         for(typename std::vector<CB>::const_iterator p = _callbacks.begin(); p != _callbacks.end(); ++p)
         {
@@ -78,7 +78,7 @@ public:
     {
     }
 
-    void response(const Ice::ObjectPrx&);
+    void response(const Ice::ObjectPrxPtr&);
 
 private:
 
@@ -96,15 +96,15 @@ public:
     {
     }
 
-    bool response(const Ice::ObjectPrx&, bool);
+    bool response(const Ice::ObjectPrxPtr&, bool);
 
     virtual bool retry();
-    virtual void finished(const Ice::ObjectPrx&);
+    virtual void finished(const Ice::ObjectPrxPtr&);
 
 private:
 
     virtual void runTimerTask();
-    std::vector<Ice::ObjectPrx> _proxies;
+    std::vector<Ice::ObjectPrxPtr> _proxies;
     IceUtil::Time _start;
     IceUtil::Time _latency;
 };
@@ -114,23 +114,23 @@ class LookupI : public Lookup, private IceUtil::Mutex
 {
 public:
 
-    LookupI(const LocatorRegistryIPtr&, const LookupPrx&, const Ice::PropertiesPtr&);
+    LookupI(const LocatorRegistryIPtr&, const LookupPrxPtr&, const Ice::PropertiesPtr&);
     virtual ~LookupI();
 
     void destroy();
 
-    void setLookupReply(const LookupReplyPrx&);
+    void setLookupReply(const LookupReplyPrxPtr&);
 
-    virtual void findObjectById(const std::string&, const Ice::Identity&, const IceDiscovery::LookupReplyPrx&, 
+    virtual void findObjectById(const std::string&, const Ice::Identity&, const IceDiscovery::LookupReplyPrxPtr&, 
                                 const Ice::Current&);
-    virtual void findAdapterById(const std::string&, const std::string&, const IceDiscovery::LookupReplyPrx&, 
+    virtual void findAdapterById(const std::string&, const std::string&, const IceDiscovery::LookupReplyPrxPtr&, 
                                  const Ice::Current&);
 
     void findObject(const Ice::AMD_Locator_findObjectByIdPtr&, const Ice::Identity&);
     void findAdapter(const Ice::AMD_Locator_findAdapterByIdPtr&, const std::string&);
 
-    void foundObject(const Ice::Identity&, const Ice::ObjectPrx&);
-    void foundAdapter(const std::string&, const Ice::ObjectPrx&, bool);
+    void foundObject(const Ice::Identity&, const Ice::ObjectPrxPtr&);
+    void foundAdapter(const std::string&, const Ice::ObjectPrxPtr&, bool);
 
     void adapterRequestTimedOut(const AdapterRequestPtr&);
     void objectRequestTimedOut(const ObjectRequestPtr&);
@@ -150,15 +150,15 @@ public:
 private:
 
     LocatorRegistryIPtr _registry;
-    const LookupPrx _lookup;
-    LookupReplyPrx _lookupReply;
+    const LookupPrxPtr _lookup;
+    LookupReplyPrxPtr _lookupReply;
     const IceUtil::Time _timeout;
     const int _retryCount;
     const int _latencyMultiplier;
     const std::string _domainId;
 
     IceUtil::TimerPtr _timer;
-    Ice::ObjectPrx _wellKnownProxy;
+    Ice::ObjectPrxPtr _wellKnownProxy;
 
     std::map<Ice::Identity, ObjectRequestPtr> _objectRequests;
     std::map<std::string, AdapterRequestPtr> _adapterRequests;
@@ -170,8 +170,8 @@ public:
 
     LookupReplyI(const LookupIPtr&);
 
-    virtual void foundObjectById(const Ice::Identity&, const Ice::ObjectPrx&, const Ice::Current&);
-    virtual void foundAdapterById(const std::string&, const Ice::ObjectPrx&, bool, const Ice::Current&);
+    virtual void foundObjectById(const Ice::Identity&, const Ice::ObjectPrxPtr&, const Ice::Current&);
+    virtual void foundAdapterById(const std::string&, const Ice::ObjectPrxPtr&, bool, const Ice::Current&);
 
 private:
 
diff --git a/cpp/src/IceGrid/.depend.mak b/cpp/src/IceGrid/.depend.mak
index deb4df90340..f2540c7e495 100755
--- a/cpp/src/IceGrid/.depend.mak
+++ b/cpp/src/IceGrid/.depend.mak
@@ -5,6 +5,7 @@ Internal.h: \
     "$(slicedir)/Ice/BuiltinSequences.ice" \
     "$(slicedir)/Ice/ProcessF.ice" \
     "$(slicedir)/Ice/Locator.ice" \
+    "$(slicedir)/Ice/Process.ice" \
     "$(slicedir)/Ice/Properties.ice" \
     "$(slicedir)/Ice/PropertiesAdmin.ice" \
     "$(slicedir)/Glacier2/Session.ice" \
@@ -21,7 +22,7 @@ IceLocatorDiscovery.h: \
     "$(slicedir)\IceLocatorDiscovery\IceLocatorDiscovery.ice" \
     "$(slicedir)/Ice/Locator.ice" \
     "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/ProcessF.ice"
+    "$(slicedir)/Ice/Process.ice"
 
 DBTypes.h: \
     DBTypes.ice \
@@ -65,6 +66,7 @@ Client.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -73,6 +75,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -107,7 +110,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -120,6 +123,7 @@ Client.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -131,7 +135,6 @@ Client.obj: \
     "$(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" \
@@ -154,7 +157,6 @@ Client.obj: \
     "$(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" \
@@ -195,6 +197,7 @@ DescriptorBuilder.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -203,6 +206,7 @@ DescriptorBuilder.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -237,7 +241,7 @@ DescriptorBuilder.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -246,6 +250,7 @@ DescriptorBuilder.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -270,7 +275,6 @@ DescriptorBuilder.obj: \
     "$(includedir)\IceGrid\Descriptor.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceGrid\Config.h" \
     "Util.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
@@ -298,6 +302,7 @@ DescriptorHelper.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -306,6 +311,7 @@ DescriptorHelper.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -346,7 +352,7 @@ DescriptorHelper.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -360,6 +366,7 @@ DescriptorHelper.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -371,7 +378,6 @@ DescriptorHelper.obj: \
     "$(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" \
@@ -394,7 +400,6 @@ DescriptorHelper.obj: \
     "$(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" \
@@ -414,6 +419,7 @@ DescriptorHelper.obj: \
     "$(includedir)\IceGrid\Config.h" \
     "$(includedir)\IceGrid\Descriptor.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\IceGrid\Observer.h" \
     "$(includedir)\IceGrid\Registry.h" \
     "$(includedir)\IceGrid\Session.h" \
@@ -437,6 +443,7 @@ DescriptorParser.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -445,6 +452,7 @@ DescriptorParser.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -485,7 +493,7 @@ DescriptorParser.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -499,6 +507,7 @@ DescriptorParser.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -510,7 +519,6 @@ DescriptorParser.obj: \
     "$(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" \
@@ -533,7 +541,6 @@ DescriptorParser.obj: \
     "$(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" \
@@ -574,6 +581,7 @@ FileParserI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -582,6 +590,7 @@ FileParserI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -616,7 +625,7 @@ FileParserI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -625,6 +634,7 @@ FileParserI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -632,7 +642,6 @@ FileParserI.obj: \
     "$(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" \
@@ -688,6 +697,7 @@ Parser.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -695,6 +705,7 @@ Parser.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -723,7 +734,7 @@ Parser.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -736,6 +747,7 @@ Parser.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -747,7 +759,6 @@ Parser.obj: \
     "$(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" \
@@ -769,7 +780,6 @@ Parser.obj: \
     "$(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" \
@@ -795,6 +805,7 @@ Parser.obj: \
     "DescriptorHelper.h" \
     "$(includedir)\IceUtil\OutputUtil.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\IceGrid\Observer.h" \
     "$(includedir)\IceGrid\Registry.h" \
     "$(includedir)\IceGrid\Session.h" \
@@ -817,6 +828,7 @@ Util.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -825,6 +837,7 @@ Util.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -865,7 +878,7 @@ Util.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -879,6 +892,7 @@ Util.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -890,7 +904,6 @@ Util.obj: \
     "$(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" \
@@ -913,7 +926,6 @@ Util.obj: \
     "$(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" \
@@ -933,6 +945,7 @@ Util.obj: \
     "$(includedir)\Glacier2\Config.h" \
     "$(includedir)\IceUtil\Random.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\IceGrid\Observer.h" \
     "$(includedir)\IceGrid\Registry.h" \
     "$(includedir)\IceGrid\Session.h" \
@@ -951,6 +964,7 @@ Internal.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -959,6 +973,7 @@ Internal.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -993,7 +1008,7 @@ Internal.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1002,6 +1017,7 @@ Internal.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1009,10 +1025,10 @@ Internal.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Ice\Locator.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Glacier2\Session.h" \
@@ -1049,6 +1065,7 @@ IceLocatorDiscovery.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1057,6 +1074,7 @@ IceLocatorDiscovery.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1091,7 +1109,7 @@ IceLocatorDiscovery.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1100,6 +1118,7 @@ IceLocatorDiscovery.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1107,9 +1126,8 @@ IceLocatorDiscovery.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -1136,6 +1154,7 @@ Grammar.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1144,6 +1163,7 @@ Grammar.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1184,7 +1204,7 @@ Grammar.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1198,6 +1218,7 @@ Grammar.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1209,7 +1230,6 @@ Grammar.obj: \
     "$(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" \
@@ -1232,7 +1252,6 @@ Grammar.obj: \
     "$(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" \
@@ -1268,6 +1287,7 @@ Scanner.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1276,6 +1296,7 @@ Scanner.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1316,7 +1337,7 @@ Scanner.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1330,6 +1351,7 @@ Scanner.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1341,7 +1363,6 @@ Scanner.obj: \
     "$(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" \
@@ -1364,7 +1385,6 @@ Scanner.obj: \
     "$(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" \
@@ -1407,6 +1427,7 @@ IceGridDB.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1415,6 +1436,7 @@ IceGridDB.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1451,7 +1473,7 @@ IceGridDB.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1465,6 +1487,7 @@ IceGridDB.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1476,7 +1499,6 @@ IceGridDB.obj: \
     "$(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" \
@@ -1498,7 +1520,6 @@ IceGridDB.obj: \
     "$(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" \
@@ -1536,6 +1557,7 @@ DBTypes.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1544,6 +1566,7 @@ DBTypes.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1578,7 +1601,7 @@ DBTypes.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1587,6 +1610,7 @@ DBTypes.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1594,7 +1618,6 @@ DBTypes.obj: \
     "$(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" \
@@ -1632,6 +1655,7 @@ AdminRouter.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1640,6 +1664,7 @@ AdminRouter.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1680,7 +1705,7 @@ AdminRouter.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1694,6 +1719,7 @@ AdminRouter.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1705,7 +1731,6 @@ AdminRouter.obj: \
     "$(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" \
@@ -1728,7 +1753,6 @@ AdminRouter.obj: \
     "$(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" \
@@ -1752,6 +1776,7 @@ FileCache.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1760,6 +1785,7 @@ FileCache.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1794,7 +1820,7 @@ FileCache.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1803,6 +1829,7 @@ FileCache.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1823,7 +1850,6 @@ FileCache.obj: \
     "$(includedir)\IceGrid\Exception.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceGrid\Config.h" \
 
 PlatformInfo.obj: \
@@ -1842,6 +1868,7 @@ PlatformInfo.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1850,6 +1877,7 @@ PlatformInfo.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1884,7 +1912,7 @@ PlatformInfo.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1893,6 +1921,7 @@ PlatformInfo.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1917,9 +1946,9 @@ PlatformInfo.obj: \
     "Internal.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Ice\Locator.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -1949,6 +1978,7 @@ SessionManager.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1957,6 +1987,7 @@ SessionManager.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1997,7 +2028,7 @@ SessionManager.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2011,6 +2042,7 @@ SessionManager.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -2022,7 +2054,6 @@ SessionManager.obj: \
     "$(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" \
@@ -2045,7 +2076,6 @@ SessionManager.obj: \
     "$(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" \
@@ -2059,6 +2089,7 @@ SessionManager.obj: \
     "$(includedir)\IceGrid\Exception.h" \
     "$(includedir)\IceGrid\Config.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -2082,6 +2113,7 @@ TraceLevels.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2090,6 +2122,7 @@ TraceLevels.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -2124,7 +2157,7 @@ TraceLevels.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2133,6 +2166,7 @@ TraceLevels.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -2168,6 +2202,7 @@ Activator.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2176,6 +2211,7 @@ Activator.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -2216,7 +2252,7 @@ Activator.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2230,6 +2266,7 @@ Activator.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -2241,7 +2278,6 @@ Activator.obj: \
     "$(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" \
@@ -2264,7 +2300,6 @@ Activator.obj: \
     "$(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" \
@@ -2275,6 +2310,7 @@ Activator.obj: \
     "$(includedir)\Ice\RegisterPlugins.h" \
     "Activator.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -2319,6 +2355,7 @@ NodeAdminRouter.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2327,6 +2364,7 @@ NodeAdminRouter.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\Ice\ProxyFactoryF.h" \
     "$(includedir)\Ice\ConnectionIF.h" \
@@ -2354,7 +2392,7 @@ NodeAdminRouter.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2363,6 +2401,7 @@ NodeAdminRouter.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -2370,13 +2409,13 @@ NodeAdminRouter.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IcePatch2\FileInfo.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\IcePatch2\Config.h" \
     "Internal.h" \
     "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Ice\Locator.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Glacier2\Session.h" \
@@ -2420,7 +2459,6 @@ NodeAdminRouter.obj: \
     "$(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" \
@@ -2465,6 +2503,7 @@ NodeI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2473,6 +2512,7 @@ NodeI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -2504,7 +2544,7 @@ NodeI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2518,6 +2558,7 @@ NodeI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -2529,7 +2570,6 @@ NodeI.obj: \
     "$(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" \
@@ -2552,7 +2592,6 @@ NodeI.obj: \
     "$(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" \
@@ -2568,6 +2607,7 @@ NodeI.obj: \
     "$(includedir)\IcePatch2\FileServer.h" \
     "NodeI.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -2608,6 +2648,7 @@ NodeSessionManager.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2616,6 +2657,7 @@ NodeSessionManager.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -2656,7 +2698,7 @@ NodeSessionManager.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2670,6 +2712,7 @@ NodeSessionManager.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -2681,7 +2724,6 @@ NodeSessionManager.obj: \
     "$(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" \
@@ -2704,7 +2746,6 @@ NodeSessionManager.obj: \
     "$(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" \
@@ -2719,6 +2760,7 @@ NodeSessionManager.obj: \
     "$(includedir)\IceGrid\Exception.h" \
     "$(includedir)\IceGrid\Config.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -2752,6 +2794,7 @@ ServerAdapterI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2760,6 +2803,7 @@ ServerAdapterI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -2800,7 +2844,7 @@ ServerAdapterI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2814,6 +2858,7 @@ ServerAdapterI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -2825,7 +2870,6 @@ ServerAdapterI.obj: \
     "$(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" \
@@ -2848,7 +2892,6 @@ ServerAdapterI.obj: \
     "$(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" \
@@ -2859,6 +2902,7 @@ ServerAdapterI.obj: \
     "$(includedir)\Ice\RegisterPlugins.h" \
     "ServerAdapterI.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -2898,6 +2942,7 @@ ServerI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2906,6 +2951,7 @@ ServerI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -2946,7 +2992,7 @@ ServerI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2960,6 +3006,7 @@ ServerI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -2971,7 +3018,6 @@ ServerI.obj: \
     "$(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" \
@@ -2994,7 +3040,6 @@ ServerI.obj: \
     "$(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" \
@@ -3006,6 +3051,7 @@ ServerI.obj: \
     "ServerI.h" \
     "Activator.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -3048,6 +3094,7 @@ AdapterCache.obj: \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -3056,6 +3103,7 @@ AdapterCache.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -3090,7 +3138,7 @@ AdapterCache.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -3099,6 +3147,7 @@ AdapterCache.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -3120,8 +3169,7 @@ AdapterCache.obj: \
     "$(includedir)\Ice\Locator.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
-    "$(includedir)\Ice\ProcessF.h" \
+    "$(includedir)\Ice\Process.h" \
     "AdapterCache.h" \
     "Cache.h" \
     "Util.h" \
@@ -3137,6 +3185,7 @@ AdapterCache.obj: \
     "TraceLevels.h" \
     "$(includedir)\IceGrid\Query.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\IceGrid\Observer.h" \
     "$(includedir)\IceGrid\Registry.h" \
     "$(includedir)\IceGrid\Session.h" \
@@ -3167,7 +3216,6 @@ AdapterCache.obj: \
     "$(includedir)\Ice\SlicedData.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\Application.h" \
     "$(includedir)\Ice\ConnectionAsync.h" \
     "$(includedir)\Ice\Functional.h" \
@@ -3202,6 +3250,7 @@ AdminCallbackRouter.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -3210,6 +3259,7 @@ AdminCallbackRouter.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -3250,7 +3300,7 @@ AdminCallbackRouter.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -3264,6 +3314,7 @@ AdminCallbackRouter.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -3275,7 +3326,6 @@ AdminCallbackRouter.obj: \
     "$(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" \
@@ -3298,7 +3348,6 @@ AdminCallbackRouter.obj: \
     "$(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" \
@@ -3329,6 +3378,7 @@ AdminI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -3337,6 +3387,7 @@ AdminI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -3377,7 +3428,7 @@ AdminI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -3391,6 +3442,7 @@ AdminI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -3402,7 +3454,6 @@ AdminI.obj: \
     "$(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" \
@@ -3425,7 +3476,6 @@ AdminI.obj: \
     "$(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" \
@@ -3450,6 +3500,7 @@ AdminI.obj: \
     "$(includedir)\IceGrid\Query.h" \
     "$(includedir)\IceGrid\Locator.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\IceGrid\Observer.h" \
     "PlatformInfo.h" \
     "ReplicaSessionManager.h" \
@@ -3509,6 +3560,7 @@ AdminSessionI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -3517,6 +3569,7 @@ AdminSessionI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -3557,7 +3610,7 @@ AdminSessionI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -3571,6 +3624,7 @@ AdminSessionI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -3582,7 +3636,6 @@ AdminSessionI.obj: \
     "$(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" \
@@ -3605,7 +3658,6 @@ AdminSessionI.obj: \
     "$(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" \
@@ -3628,6 +3680,7 @@ AdminSessionI.obj: \
     "$(includedir)\IceGrid\Query.h" \
     "$(includedir)\IceGrid\Locator.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\IceGrid\Observer.h" \
     "PlatformInfo.h" \
     "ReplicaSessionManager.h" \
@@ -3694,6 +3747,7 @@ Allocatable.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -3702,6 +3756,7 @@ Allocatable.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\Ice\ProxyFactoryF.h" \
     "$(includedir)\Ice\ConnectionIF.h" \
@@ -3729,7 +3784,7 @@ Allocatable.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -3738,6 +3793,7 @@ Allocatable.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -3745,7 +3801,6 @@ Allocatable.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
@@ -3793,7 +3848,6 @@ Allocatable.obj: \
     "$(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" \
@@ -3822,6 +3876,7 @@ AllocatableObjectCache.obj: \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -3830,6 +3885,7 @@ AllocatableObjectCache.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -3864,7 +3920,7 @@ AllocatableObjectCache.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -3873,6 +3929,7 @@ AllocatableObjectCache.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -3898,7 +3955,6 @@ AllocatableObjectCache.obj: \
     "$(includedir)\IceGrid\Descriptor.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceGrid\Config.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
     "$(includedir)\IceGrid\Exception.h" \
@@ -3939,7 +3995,6 @@ AllocatableObjectCache.obj: \
     "$(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" \
@@ -3970,6 +4025,7 @@ Database.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -3978,6 +4034,7 @@ Database.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -4016,7 +4073,7 @@ Database.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -4025,6 +4082,7 @@ Database.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -4045,7 +4103,6 @@ Database.obj: \
     "$(includedir)\IceGrid\Admin.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\SliceChecksumDict.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
@@ -4056,6 +4113,7 @@ Database.obj: \
     "Internal.h" \
     "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Ice\Locator.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\IceGrid\Observer.h" \
     "$(includedir)\IceGrid\Registry.h" \
     "$(includedir)\IceGrid\Session.h" \
@@ -4113,6 +4171,7 @@ FileUserAccountMapperI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -4121,6 +4180,7 @@ FileUserAccountMapperI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -4155,7 +4215,7 @@ FileUserAccountMapperI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -4164,13 +4224,13 @@ FileUserAccountMapperI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceGrid\Config.h" \
 
 InternalRegistryI.obj: \
@@ -4190,6 +4250,7 @@ InternalRegistryI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -4198,6 +4259,7 @@ InternalRegistryI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -4238,7 +4300,7 @@ InternalRegistryI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -4252,6 +4314,7 @@ InternalRegistryI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -4263,7 +4326,6 @@ InternalRegistryI.obj: \
     "$(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" \
@@ -4286,7 +4348,6 @@ InternalRegistryI.obj: \
     "$(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" \
@@ -4308,6 +4369,7 @@ InternalRegistryI.obj: \
     "$(includedir)\IceGrid\Query.h" \
     "$(includedir)\IceGrid\Locator.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\IceGrid\Observer.h" \
     "PlatformInfo.h" \
     "ReplicaSessionManager.h" \
@@ -4367,6 +4429,7 @@ LocatorI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -4375,6 +4438,7 @@ LocatorI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -4415,7 +4479,7 @@ LocatorI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -4429,6 +4493,7 @@ LocatorI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -4440,7 +4505,6 @@ LocatorI.obj: \
     "$(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" \
@@ -4463,7 +4527,6 @@ LocatorI.obj: \
     "$(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" \
@@ -4474,6 +4537,7 @@ LocatorI.obj: \
     "$(includedir)\Ice\RegisterPlugins.h" \
     "LocatorI.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -4533,6 +4597,7 @@ LocatorRegistryI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -4541,6 +4606,7 @@ LocatorRegistryI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -4581,7 +4647,7 @@ LocatorRegistryI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -4595,6 +4661,7 @@ LocatorRegistryI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -4606,7 +4673,6 @@ LocatorRegistryI.obj: \
     "$(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" \
@@ -4629,7 +4695,6 @@ LocatorRegistryI.obj: \
     "$(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" \
@@ -4640,6 +4705,7 @@ LocatorRegistryI.obj: \
     "$(includedir)\Ice\RegisterPlugins.h" \
     "LocatorRegistryI.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -4691,6 +4757,7 @@ NodeCache.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -4699,6 +4766,7 @@ NodeCache.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -4733,7 +4801,7 @@ NodeCache.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -4742,6 +4810,7 @@ NodeCache.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -4767,7 +4836,6 @@ NodeCache.obj: \
     "$(includedir)\IceGrid\Descriptor.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceGrid\Config.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
     "$(includedir)\IceGrid\Exception.h" \
@@ -4781,6 +4849,7 @@ NodeCache.obj: \
     "Internal.h" \
     "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Ice\Locator.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\IceGrid\Observer.h" \
     "$(includedir)\IceGrid\Registry.h" \
     "$(includedir)\IceGrid\Session.h" \
@@ -4806,7 +4875,6 @@ NodeCache.obj: \
     "$(includedir)\Ice\SlicedData.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\Application.h" \
     "$(includedir)\Ice\ConnectionAsync.h" \
     "$(includedir)\Ice\Functional.h" \
@@ -4851,6 +4919,7 @@ NodeSessionI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -4859,6 +4928,7 @@ NodeSessionI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -4899,7 +4969,7 @@ NodeSessionI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -4913,6 +4983,7 @@ NodeSessionI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -4924,7 +4995,6 @@ NodeSessionI.obj: \
     "$(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" \
@@ -4947,7 +5017,6 @@ NodeSessionI.obj: \
     "$(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" \
@@ -4958,6 +5027,7 @@ NodeSessionI.obj: \
     "$(includedir)\Ice\RegisterPlugins.h" \
     "NodeSessionI.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -5007,6 +5077,7 @@ ObjectCache.obj: \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -5015,6 +5086,7 @@ ObjectCache.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -5049,7 +5121,7 @@ ObjectCache.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -5058,6 +5130,7 @@ ObjectCache.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -5083,7 +5156,6 @@ ObjectCache.obj: \
     "$(includedir)\IceGrid\Descriptor.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceGrid\Config.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
     "$(includedir)\IceGrid\Exception.h" \
@@ -5096,6 +5168,7 @@ ObjectCache.obj: \
     "Internal.h" \
     "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Ice\Locator.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\IceGrid\Observer.h" \
     "$(includedir)\IceGrid\Registry.h" \
     "$(includedir)\IceGrid\Session.h" \
@@ -5124,7 +5197,6 @@ ObjectCache.obj: \
     "$(includedir)\Ice\SlicedData.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\Application.h" \
     "$(includedir)\Ice\ConnectionAsync.h" \
     "$(includedir)\Ice\Functional.h" \
@@ -5163,6 +5235,7 @@ PluginFacadeI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -5171,6 +5244,7 @@ PluginFacadeI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\Ice\ProxyFactoryF.h" \
     "$(includedir)\Ice\ConnectionIF.h" \
@@ -5200,7 +5274,7 @@ PluginFacadeI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -5209,6 +5283,7 @@ PluginFacadeI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -5216,7 +5291,6 @@ PluginFacadeI.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\IceGrid\Admin.h" \
     "$(includedir)\Ice\Properties.h" \
@@ -5233,6 +5307,7 @@ PluginFacadeI.obj: \
     "Internal.h" \
     "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Ice\Locator.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\IceGrid\Observer.h" \
     "$(includedir)\IceGrid\Registry.h" \
     "$(includedir)\IceGrid\Session.h" \
@@ -5283,6 +5358,7 @@ QueryI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -5291,6 +5367,7 @@ QueryI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -5325,7 +5402,7 @@ QueryI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -5334,6 +5411,7 @@ QueryI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -5341,10 +5419,10 @@ QueryI.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Ice\Locator.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Glacier2\Session.h" \
@@ -5410,6 +5488,7 @@ ReapThread.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -5418,6 +5497,7 @@ ReapThread.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -5458,7 +5538,7 @@ ReapThread.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -5472,6 +5552,7 @@ ReapThread.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -5483,7 +5564,6 @@ ReapThread.obj: \
     "$(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" \
@@ -5506,7 +5586,6 @@ ReapThread.obj: \
     "$(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" \
@@ -5539,6 +5618,7 @@ RegistryAdminRouter.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -5547,6 +5627,7 @@ RegistryAdminRouter.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -5576,7 +5657,7 @@ RegistryAdminRouter.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -5585,6 +5666,7 @@ RegistryAdminRouter.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -5592,7 +5674,6 @@ RegistryAdminRouter.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
@@ -5606,6 +5687,7 @@ RegistryAdminRouter.obj: \
     "Internal.h" \
     "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Ice\Locator.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\IceGrid\Observer.h" \
     "$(includedir)\IceGrid\Registry.h" \
     "$(includedir)\IceGrid\Session.h" \
@@ -5661,7 +5743,6 @@ RegistryAdminRouter.obj: \
     "$(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" \
@@ -5693,6 +5774,7 @@ RegistryI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -5701,6 +5783,7 @@ RegistryI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -5741,7 +5824,7 @@ RegistryI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -5755,6 +5838,7 @@ RegistryI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -5766,7 +5850,6 @@ RegistryI.obj: \
     "$(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" \
@@ -5789,7 +5872,6 @@ RegistryI.obj: \
     "$(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" \
@@ -5829,6 +5911,7 @@ RegistryI.obj: \
     "$(includedir)\IceGrid\Config.h" \
     "$(includedir)\IceGrid\Descriptor.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\IceGrid\Observer.h" \
     "$(includedir)\IceGrid\Registry.h" \
     "$(includedir)\IceGrid\Session.h" \
@@ -5889,6 +5972,7 @@ ReplicaCache.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -5897,6 +5981,7 @@ ReplicaCache.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -5931,7 +6016,7 @@ ReplicaCache.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -5940,6 +6025,7 @@ ReplicaCache.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -5965,7 +6051,6 @@ ReplicaCache.obj: \
     "$(includedir)\IceGrid\Descriptor.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceGrid\Config.h" \
     "$(includedir)\IceUtil\StringUtil.h" \
     "$(includedir)\IceGrid\Exception.h" \
@@ -5979,6 +6064,7 @@ ReplicaCache.obj: \
     "Internal.h" \
     "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Ice\Locator.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\IceGrid\Observer.h" \
     "$(includedir)\IceGrid\Registry.h" \
     "$(includedir)\IceGrid\Session.h" \
@@ -6005,6 +6091,7 @@ ReplicaSessionI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -6013,6 +6100,7 @@ ReplicaSessionI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -6053,7 +6141,7 @@ ReplicaSessionI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -6067,6 +6155,7 @@ ReplicaSessionI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -6078,7 +6167,6 @@ ReplicaSessionI.obj: \
     "$(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" \
@@ -6101,7 +6189,6 @@ ReplicaSessionI.obj: \
     "$(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" \
@@ -6121,6 +6208,7 @@ ReplicaSessionI.obj: \
     "$(includedir)\IceGrid\Admin.h" \
     "$(includedir)\IceGrid\Descriptor.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\IceGrid\Observer.h" \
     "Database.h" \
     "$(includedir)\IceUtil\FileUtil.h" \
@@ -6165,6 +6253,7 @@ ReplicaSessionManager.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -6173,6 +6262,7 @@ ReplicaSessionManager.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -6213,7 +6303,7 @@ ReplicaSessionManager.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -6227,6 +6317,7 @@ ReplicaSessionManager.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -6238,7 +6329,6 @@ ReplicaSessionManager.obj: \
     "$(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" \
@@ -6261,7 +6351,6 @@ ReplicaSessionManager.obj: \
     "$(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" \
@@ -6276,6 +6365,7 @@ ReplicaSessionManager.obj: \
     "$(includedir)\IceGrid\Exception.h" \
     "$(includedir)\IceGrid\Config.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -6325,6 +6415,7 @@ ServerCache.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -6333,6 +6424,7 @@ ServerCache.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -6371,7 +6463,7 @@ ServerCache.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -6380,6 +6472,7 @@ ServerCache.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -6398,11 +6491,11 @@ ServerCache.obj: \
     "$(includedir)\IceGrid\Descriptor.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceGrid\Config.h" \
     "Internal.h" \
     "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Ice\Locator.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -6445,7 +6538,6 @@ ServerCache.obj: \
     "$(includedir)\Ice\SlicedData.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\Ice\OutgoingAsyncF.h" \
-    "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\Application.h" \
     "$(includedir)\Ice\ConnectionAsync.h" \
     "$(includedir)\Ice\Functional.h" \
@@ -6482,6 +6574,7 @@ SessionI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -6490,6 +6583,7 @@ SessionI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -6530,7 +6624,7 @@ SessionI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -6544,6 +6638,7 @@ SessionI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -6555,7 +6650,6 @@ SessionI.obj: \
     "$(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" \
@@ -6578,7 +6672,6 @@ SessionI.obj: \
     "$(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" \
@@ -6605,6 +6698,7 @@ SessionI.obj: \
     "$(includedir)\IceGrid\Query.h" \
     "LocatorI.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\IceGrid\Admin.h" \
     "$(includedir)\IceGrid\Descriptor.h" \
     "$(includedir)\IceGrid\Observer.h" \
@@ -6650,6 +6744,7 @@ SessionServantManager.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -6658,6 +6753,7 @@ SessionServantManager.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -6694,7 +6790,7 @@ SessionServantManager.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -6721,6 +6817,7 @@ SessionServantManager.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
@@ -6731,7 +6828,6 @@ SessionServantManager.obj: \
     "$(includedir)\Ice\RemoteLogger.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Communicator.h" \
     "$(includedir)\Ice\RouterF.h" \
     "$(includedir)\Ice\PluginF.h" \
@@ -6750,7 +6846,6 @@ SessionServantManager.obj: \
     "$(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" \
@@ -6782,6 +6877,7 @@ Topics.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -6790,6 +6886,7 @@ Topics.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -6830,7 +6927,7 @@ Topics.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -6844,6 +6941,7 @@ Topics.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -6855,7 +6953,6 @@ Topics.obj: \
     "$(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" \
@@ -6878,7 +6975,6 @@ Topics.obj: \
     "$(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" \
@@ -6892,6 +6988,7 @@ Topics.obj: \
     "$(includedir)\IceStorm\Metrics.h" \
     "$(includedir)\IceStorm\Config.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -6920,6 +7017,7 @@ WellKnownObjectsManager.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -6928,6 +7026,7 @@ WellKnownObjectsManager.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Version.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -6964,7 +7063,7 @@ WellKnownObjectsManager.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -6973,13 +7072,13 @@ WellKnownObjectsManager.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Glacier2\Config.h" \
     "WellKnownObjectsManager.h" \
@@ -6987,6 +7086,7 @@ WellKnownObjectsManager.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Ice\Locator.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Glacier2\Session.h" \
@@ -7062,6 +7162,7 @@ IceGridNode.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -7070,6 +7171,7 @@ IceGridNode.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -7101,7 +7203,7 @@ IceGridNode.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -7115,6 +7217,7 @@ IceGridNode.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -7126,7 +7229,6 @@ IceGridNode.obj: \
     "$(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" \
@@ -7149,7 +7251,6 @@ IceGridNode.obj: \
     "$(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" \
@@ -7160,6 +7261,7 @@ IceGridNode.obj: \
     "$(includedir)\Ice\RegisterPlugins.h" \
     "Activator.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Glacier2\Config.h" \
@@ -7222,6 +7324,7 @@ IceGridRegistry.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -7230,6 +7333,7 @@ IceGridRegistry.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -7266,7 +7370,7 @@ IceGridRegistry.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -7280,6 +7384,7 @@ IceGridRegistry.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -7291,7 +7396,6 @@ IceGridRegistry.obj: \
     "$(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" \
@@ -7314,7 +7418,6 @@ IceGridRegistry.obj: \
     "$(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" \
@@ -7336,6 +7439,7 @@ IceGridRegistry.obj: \
     "$(includedir)\IceGrid\Query.h" \
     "$(includedir)\IceGrid\Locator.h" \
     "Internal.h" \
+    "$(includedir)\Ice\ProcessF.h" \
     "$(includedir)\IceGrid\Observer.h" \
     "PlatformInfo.h" \
     "ReplicaSessionManager.h" \
diff --git a/cpp/src/IceGridLib/.depend.mak b/cpp/src/IceGridLib/.depend.mak
index 8c45d59ffd5..990261a241e 100755
--- a/cpp/src/IceGridLib/.depend.mak
+++ b/cpp/src/IceGridLib/.depend.mak
@@ -38,7 +38,7 @@ Locator.h: \
     "$(slicedir)\IceGrid\Locator.ice" \
     "$(slicedir)/Ice/Locator.ice" \
     "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/ProcessF.ice"
+    "$(slicedir)/Ice/Process.ice"
 
 Observer.h: \
     "$(slicedir)\IceGrid\Observer.ice" \
@@ -116,6 +116,7 @@ PluginFacadeI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -124,6 +125,7 @@ PluginFacadeI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -158,7 +160,7 @@ PluginFacadeI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -167,6 +169,7 @@ PluginFacadeI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -174,7 +177,6 @@ PluginFacadeI.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
@@ -188,7 +190,7 @@ PluginFacadeI.obj: \
     "$(includedir)\IceGrid\FileParser.h" \
     "$(includedir)\IceGrid\Locator.h" \
     "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\IceGrid\Observer.h" \
     "$(includedir)\IceGrid\Query.h" \
     "$(includedir)\IceGrid\Registry.h" \
@@ -210,6 +212,7 @@ Admin.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -218,6 +221,7 @@ Admin.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -252,7 +256,7 @@ Admin.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -261,6 +265,7 @@ Admin.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -268,7 +273,6 @@ Admin.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
@@ -302,6 +306,7 @@ Descriptor.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -310,6 +315,7 @@ Descriptor.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -344,7 +350,7 @@ Descriptor.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -353,13 +359,13 @@ Descriptor.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\IceGrid\Config.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -385,6 +391,7 @@ Exception.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -393,6 +400,7 @@ Exception.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\IceUtil\Mutex.h" \
@@ -401,12 +409,11 @@ Exception.obj: \
     "$(includedir)\IceUtil\Time.h" \
     "$(includedir)\IceUtil\MutexProtocol.h" \
     "$(includedir)\Ice\UserExceptionFactory.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\IceGrid\Config.h" \
@@ -441,6 +448,7 @@ FileParser.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -449,6 +457,7 @@ FileParser.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -483,7 +492,7 @@ FileParser.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -492,6 +501,7 @@ FileParser.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -499,7 +509,6 @@ FileParser.obj: \
     "$(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" \
@@ -534,6 +543,7 @@ Locator.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -542,6 +552,7 @@ Locator.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -576,7 +587,7 @@ Locator.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -585,6 +596,7 @@ Locator.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -592,9 +604,8 @@ Locator.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\IceGrid\Config.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
@@ -620,6 +631,7 @@ Observer.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -628,6 +640,7 @@ Observer.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -662,7 +675,7 @@ Observer.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -671,6 +684,7 @@ Observer.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -678,7 +692,6 @@ Observer.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
@@ -713,6 +726,7 @@ PluginFacade.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -721,6 +735,7 @@ PluginFacade.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -755,7 +770,7 @@ PluginFacade.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -764,6 +779,7 @@ PluginFacade.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -771,7 +787,6 @@ PluginFacade.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\IceGrid\Admin.h" \
     "$(includedir)\Ice\Properties.h" \
@@ -806,6 +821,7 @@ Query.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -814,6 +830,7 @@ Query.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -848,7 +865,7 @@ Query.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -857,13 +874,13 @@ Query.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\IceGrid\Exception.h" \
     "$(includedir)\IceGrid\Config.h" \
@@ -890,6 +907,7 @@ Registry.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -898,6 +916,7 @@ Registry.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -932,7 +951,7 @@ Registry.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -941,6 +960,7 @@ Registry.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -948,7 +968,6 @@ Registry.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceGrid\Exception.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\IceGrid\Config.h" \
@@ -984,6 +1003,7 @@ Session.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -992,6 +1012,7 @@ Session.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1026,7 +1047,7 @@ Session.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1035,6 +1056,7 @@ Session.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1042,7 +1064,6 @@ Session.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
@@ -1073,6 +1094,7 @@ UserAccountMapper.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1081,6 +1103,7 @@ UserAccountMapper.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1115,7 +1138,7 @@ UserAccountMapper.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1124,13 +1147,13 @@ UserAccountMapper.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceGrid\Config.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
diff --git a/cpp/src/IceLocatorDiscovery/.depend.mak b/cpp/src/IceLocatorDiscovery/.depend.mak
index 02e8062654f..fd730bba1d9 100755
--- a/cpp/src/IceLocatorDiscovery/.depend.mak
+++ b/cpp/src/IceLocatorDiscovery/.depend.mak
@@ -3,7 +3,7 @@ IceLocatorDiscovery.h: \
     "$(slicedir)\IceLocatorDiscovery\IceLocatorDiscovery.ice" \
     "$(slicedir)/Ice/Locator.ice" \
     "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/ProcessF.ice"
+    "$(slicedir)/Ice/Process.ice"
 
 PluginI.obj: \
 	PluginI.cpp \
@@ -40,6 +40,7 @@ PluginI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -47,6 +48,7 @@ PluginI.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -75,7 +77,7 @@ PluginI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -88,6 +90,7 @@ PluginI.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -99,7 +102,6 @@ PluginI.obj: \
     "$(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" \
@@ -121,7 +123,6 @@ PluginI.obj: \
     "$(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" \
@@ -147,6 +148,7 @@ IceLocatorDiscovery.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -155,6 +157,7 @@ IceLocatorDiscovery.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -189,7 +192,7 @@ IceLocatorDiscovery.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -198,6 +201,7 @@ IceLocatorDiscovery.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -205,9 +209,8 @@ IceLocatorDiscovery.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
diff --git a/cpp/src/IcePatch2/.depend.mak b/cpp/src/IcePatch2/.depend.mak
index 8dd23e9a528..36f69efca33 100755
--- a/cpp/src/IcePatch2/.depend.mak
+++ b/cpp/src/IcePatch2/.depend.mak
@@ -21,6 +21,7 @@ FileServerI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -28,6 +29,7 @@ FileServerI.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -68,7 +70,7 @@ FileServerI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -82,6 +84,7 @@ FileServerI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -93,7 +96,6 @@ FileServerI.obj: \
     "$(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" \
@@ -116,7 +118,6 @@ FileServerI.obj: \
     "$(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" \
@@ -155,6 +156,7 @@ Server.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -163,6 +165,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -199,7 +202,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -213,6 +216,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -224,7 +228,6 @@ Server.obj: \
     "$(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" \
@@ -247,7 +250,6 @@ Server.obj: \
     "$(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" \
@@ -285,6 +287,7 @@ Client.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -293,6 +296,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -329,7 +333,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -343,6 +347,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -354,7 +359,6 @@ Client.obj: \
     "$(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" \
@@ -376,7 +380,6 @@ Client.obj: \
     "$(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" \
@@ -416,6 +419,7 @@ Calc.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -424,6 +428,7 @@ Calc.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -460,7 +465,7 @@ Calc.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -474,6 +479,7 @@ Calc.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -485,7 +491,6 @@ Calc.obj: \
     "$(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" \
@@ -508,7 +513,6 @@ Calc.obj: \
     "$(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" \
diff --git a/cpp/src/IcePatch2Lib/.depend.mak b/cpp/src/IcePatch2Lib/.depend.mak
index 0cb1b3dd19b..64275c06071 100755
--- a/cpp/src/IcePatch2Lib/.depend.mak
+++ b/cpp/src/IcePatch2Lib/.depend.mak
@@ -27,6 +27,7 @@ ClientUtil.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -35,6 +36,7 @@ ClientUtil.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -75,7 +77,7 @@ ClientUtil.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -89,6 +91,7 @@ ClientUtil.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -100,7 +103,6 @@ ClientUtil.obj: \
     "$(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" \
@@ -123,7 +125,6 @@ ClientUtil.obj: \
     "$(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" \
@@ -176,6 +177,7 @@ Util.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -183,6 +185,7 @@ Util.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -211,7 +214,7 @@ Util.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -224,6 +227,7 @@ Util.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -235,7 +239,6 @@ Util.obj: \
     "$(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" \
@@ -257,7 +260,6 @@ Util.obj: \
     "$(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" \
@@ -284,6 +286,7 @@ FileInfo.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -292,6 +295,7 @@ FileInfo.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -312,7 +316,7 @@ FileInfo.obj: \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -334,6 +338,7 @@ FileServer.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -342,6 +347,7 @@ FileServer.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -376,7 +382,7 @@ FileServer.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -385,6 +391,7 @@ FileServer.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -392,7 +399,6 @@ FileServer.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IcePatch2\FileInfo.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\IcePatch2\Config.h" \
diff --git a/cpp/src/IceSSL/.depend.mak b/cpp/src/IceSSL/.depend.mak
index 88383320dee..10b607aeafc 100755
--- a/cpp/src/IceSSL/.depend.mak
+++ b/cpp/src/IceSSL/.depend.mak
@@ -30,6 +30,7 @@ ConnectionInfo.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -38,6 +39,7 @@ ConnectionInfo.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -72,7 +74,7 @@ ConnectionInfo.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -101,6 +103,7 @@ EndpointInfo.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -109,6 +112,7 @@ EndpointInfo.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Endpoint.h" \
     "$(includedir)\Ice\Version.h" \
@@ -130,7 +134,7 @@ EndpointInfo.obj: \
     "$(includedir)\Ice\ObjectAdapterF.h" \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -160,6 +164,7 @@ AcceptorI.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -168,6 +173,7 @@ AcceptorI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -202,7 +208,7 @@ AcceptorI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -213,13 +219,13 @@ AcceptorI.obj: \
     "..\..\src\Ice\ProtocolInstanceF.h" \
     "InstanceF.h" \
     "EndpointI.h" \
-    "..\..\src\Ice\IPEndpointI.h" \
-    "$(includedir)\IceUtil\Thread.h" \
-    "..\..\src\Ice\IPEndpointIF.h" \
     "..\..\src\Ice\EndpointI.h" \
     "$(includedir)\Ice\Endpoint.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "..\..\src\Ice\ConnectorF.h" \
+    "..\..\src\Ice\IPEndpointI.h" \
+    "$(includedir)\IceUtil\Thread.h" \
+    "..\..\src\Ice\IPEndpointIF.h" \
     "..\..\src\Ice\EndpointFactory.h" \
     "..\..\src\Ice\EndpointFactoryF.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -254,6 +260,7 @@ AcceptorI.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -306,6 +313,7 @@ Certificate.obj: \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -314,6 +322,7 @@ Certificate.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\LoggerF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -347,7 +356,7 @@ Certificate.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -380,6 +389,7 @@ ConnectorI.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -388,6 +398,7 @@ ConnectorI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -422,7 +433,7 @@ ConnectorI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -469,6 +480,7 @@ ConnectorI.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -486,9 +498,9 @@ ConnectorI.obj: \
     "SecureTransportTransceiverI.h" \
     "SChannelTransceiverI.h" \
     "EndpointI.h" \
-    "..\..\src\Ice\IPEndpointI.h" \
     "..\..\src\Ice\EndpointI.h" \
     "..\..\src\Ice\AcceptorF.h" \
+    "..\..\src\Ice\IPEndpointI.h" \
     "..\..\src\Ice\EndpointFactory.h" \
     "..\..\src\Ice\EndpointFactoryF.h" \
     "..\..\src\Ice\WSEndpoint.h" \
@@ -507,30 +519,21 @@ ConnectorI.obj: \
 EndpointI.obj: \
 	EndpointI.cpp \
     "EndpointI.h" \
-    "..\..\src\Ice\IPEndpointI.h" \
-    "$(includedir)\IceUtil\Config.h" \
+    "..\..\src\Ice\EndpointI.h" \
+    "..\..\src\Ice\EndpointIF.h" \
     "$(includedir)\IceUtil\Shared.h" \
+    "$(includedir)\IceUtil\Config.h" \
     "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.h" \
+    "$(includedir)\Ice\Handle.h" \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Monitor.h" \
-    "$(includedir)\IceUtil\Cond.h" \
-    "..\..\src\Ice\IPEndpointIF.h" \
-    "$(includedir)\Ice\Handle.h" \
     "$(includedir)\Ice\Config.h" \
-    "..\..\src\Ice\EndpointI.h" \
-    "..\..\src\Ice\EndpointIF.h" \
     "$(includedir)\Ice\Endpoint.h" \
     "$(includedir)\IceUtil\PushDisableWarnings.h" \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -539,6 +542,7 @@ EndpointI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Version.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -549,6 +553,16 @@ EndpointI.obj: \
     "..\..\src\Ice\TransceiverF.h" \
     "..\..\src\Ice\ConnectorF.h" \
     "..\..\src\Ice\AcceptorF.h" \
+    "..\..\src\Ice\IPEndpointI.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" \
+    "..\..\src\Ice\IPEndpointIF.h" \
     "..\..\src\Ice\Network.h" \
     "..\..\src\Ice\NetworkF.h" \
     "..\..\src\Ice\NetworkProxyF.h" \
@@ -574,7 +588,7 @@ EndpointI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -617,6 +631,7 @@ EndpointI.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -653,6 +668,7 @@ Instance.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -661,6 +677,7 @@ Instance.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -695,7 +712,7 @@ Instance.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -741,6 +758,7 @@ Instance.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -774,6 +792,7 @@ PluginI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -782,6 +801,7 @@ PluginI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\LoggerF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -819,7 +839,7 @@ PluginI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -868,6 +888,7 @@ PluginI.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -877,10 +898,10 @@ PluginI.obj: \
     "TrustManagerF.h" \
     "..\..\src\Ice\Network.h" \
     "EndpointI.h" \
-    "..\..\src\Ice\IPEndpointI.h" \
     "..\..\src\Ice\EndpointI.h" \
     "..\..\src\Ice\TransceiverF.h" \
     "..\..\src\Ice\AcceptorF.h" \
+    "..\..\src\Ice\IPEndpointI.h" \
     "..\..\src\Ice\EndpointFactory.h" \
     "..\..\src\Ice\EndpointFactoryF.h" \
     "..\..\src\Ice\WSEndpoint.h" \
@@ -905,6 +926,7 @@ RFC2253.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -913,6 +935,7 @@ RFC2253.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\LoggerF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -950,7 +973,7 @@ RFC2253.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -978,6 +1001,7 @@ SChannelEngine.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -986,6 +1010,7 @@ SChannelEngine.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\LoggerF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -1023,7 +1048,7 @@ SChannelEngine.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1045,6 +1070,7 @@ SChannelEngine.obj: \
     "$(includedir)\Ice\Communicator.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1081,6 +1107,7 @@ SChannelTransceiverI.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1089,6 +1116,7 @@ SChannelTransceiverI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\LoggerF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -1125,7 +1153,7 @@ SChannelTransceiverI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1177,6 +1205,7 @@ SChannelTransceiverI.obj: \
     "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1214,6 +1243,7 @@ SSLEngine.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1222,6 +1252,7 @@ SSLEngine.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\LoggerF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -1259,7 +1290,7 @@ SSLEngine.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1282,6 +1313,7 @@ SSLEngine.obj: \
     "$(includedir)\Ice\Communicator.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1314,6 +1346,7 @@ TrustManager.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1322,6 +1355,7 @@ TrustManager.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1362,7 +1396,7 @@ TrustManager.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1375,6 +1409,7 @@ TrustManager.obj: \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1418,6 +1453,7 @@ Util.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1426,6 +1462,7 @@ Util.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\LoggerF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -1459,7 +1496,7 @@ Util.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
diff --git a/cpp/src/IceSSL/Certificate.cpp b/cpp/src/IceSSL/Certificate.cpp
index d8145b68153..795e1df4f3f 100644
--- a/cpp/src/IceSSL/Certificate.cpp
+++ b/cpp/src/IceSSL/Certificate.cpp
@@ -874,11 +874,11 @@ CertificatePtr
 Certificate::load(const string& file)
 {
 #if defined(ICE_USE_SECURE_TRANSPORT)
-    return new Certificate(loadCertificate(file));
+    return ICE_MAKE_SHARED(Certificate, loadCertificate(file));
 #elif defined(ICE_USE_SCHANNEL)
     CERT_SIGNED_CONTENT_INFO* cert;
     loadCertificate(&cert, file);
-    return new Certificate(cert);
+    return ICE_MAKE_SHARED(Certificate, cert);
 #else
     BIO *cert = BIO_new(BIO_s_file());
     if(BIO_read_filename(cert, file.c_str()) <= 0)
@@ -894,7 +894,7 @@ Certificate::load(const string& file)
         throw CertificateReadException(__FILE__, __LINE__, "error reading file:\n" + getSslErrors(false));
     }
     BIO_free(cert);
-    return new Certificate(x);
+    return ICE_MAKE_SHARED(Certificate, x);
 #endif
 }
 
@@ -925,11 +925,11 @@ Certificate::decode(const string& encoding)
     CFRelease(items);
 
     assert(SecCertificateGetTypeID() == CFGetTypeID(item));
-    return new Certificate((SecCertificateRef)item);
+    return ICE_MAKE_SHARED(Certificate, (SecCertificateRef)item);
 #elif defined(ICE_USE_SCHANNEL)
     CERT_SIGNED_CONTENT_INFO* cert;
     loadCertificate(&cert, encoding.c_str(), static_cast<DWORD>(encoding.size()));
-    return new Certificate(cert);
+    return ICE_MAKE_SHARED(Certificate, cert);
 #else
     BIO *cert = BIO_new_mem_buf(static_cast<void*>(const_cast<char*>(&encoding[0])), static_cast<int>(encoding.size()));
     X509CertificateRef x = PEM_read_bio_X509_AUX(cert, NULL, NULL, NULL);
@@ -939,7 +939,7 @@ Certificate::decode(const string& encoding)
         throw CertificateEncodingException(__FILE__, __LINE__, getSslErrors(false));
     }
     BIO_free(cert);
-    return new Certificate(x);
+    return ICE_MAKE_SHARED(Certificate, x);
 #endif
 }
 
@@ -977,11 +977,24 @@ Certificate::getPublicKey() const
     {
         throw CertificateEncodingException(__FILE__, __LINE__, errorToString(err));
     }
+#   ifdef ICE_CPP11_MAPPING
+    return make_shared<PublicKey>(const_pointer_cast<Certificate>(shared_from_this()), key);
+#   else
     return new PublicKey(const_cast<Certificate*>(this), key);
+#   endif
 #elif defined(ICE_USE_SCHANNEL)
+#   ifdef ICE_CPP11_MAPPING
+    return make_shared<PublicKey>(const_pointer_cast<Certificate>(shared_from_this()),
+                                  &_certInfo->SubjectPublicKeyInfo);
+#   else
     return new PublicKey(const_cast<Certificate*>(this), &_certInfo->SubjectPublicKeyInfo);
+#   endif
 #else
+#   ifdef ICE_CPP11_MAPPING
+    return make_shared<PublicKey>(const_pointer_cast<Certificate>(shared_from_this()), X509_get_pubkey(_cert));
+#   else
     return new PublicKey(const_cast<Certificate*>(this), X509_get_pubkey(_cert));
+#   endif
 #endif
 }
 
diff --git a/cpp/src/IceSSL/EndpointI.cpp b/cpp/src/IceSSL/EndpointI.cpp
index 6893db0e117..88e258f868b 100644
--- a/cpp/src/IceSSL/EndpointI.cpp
+++ b/cpp/src/IceSSL/EndpointI.cpp
@@ -21,7 +21,9 @@ using namespace std;
 using namespace Ice;
 using namespace IceSSL;
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::Shared* IceSSL::upCast(EndpointI* p) { return p; }
+#endif
 
 IceSSL::EndpointI::EndpointI(const InstancePtr& instance, const string& ho, Int po,
                              const IceInternal::Address& sourceAddr, Int ti, const string& conId, bool co) :
@@ -53,7 +55,13 @@ IceSSL::EndpointI::EndpointI(const InstancePtr& instance, IceInternal::BasicStre
 Ice::EndpointInfoPtr
 IceSSL::EndpointI::getInfo() const
 {
+#ifdef ICE_CPP11_MAPPING
+    EndpointInfoPtr info = make_shared<IceInternal::InfoI<EndpointInfo>>(
+        dynamic_pointer_cast<IceInternal::EndpointI>(
+            const_pointer_cast<IceInternal::EndpointI>(shared_from_this())));
+#else
     EndpointInfoPtr info = new IceInternal::InfoI<EndpointInfo>(const_cast<EndpointI*>(this));
+#endif
     fillEndpointInfo(info.get());
     return info;
 }
@@ -61,7 +69,13 @@ IceSSL::EndpointI::getInfo() const
 Ice::EndpointInfoPtr
 IceSSL::EndpointI::getWSInfo(const string& resource) const
 {
+#ifdef ICE_CPP11_MAPPING
+    WSEndpointInfoPtr info = make_shared<IceInternal::InfoI<Ice::WSEndpointInfo>>(
+        dynamic_pointer_cast<IceInternal::EndpointI>(
+            const_pointer_cast<IceInternal::EndpointI>(shared_from_this())));
+#else
     WSSEndpointInfoPtr info = new IceInternal::InfoI<WSSEndpointInfo>(const_cast<EndpointI*>(this));
+#endif
     fillEndpointInfo(info.get());
     info->resource = resource;
     return info;
@@ -78,11 +92,15 @@ IceSSL::EndpointI::timeout(Int timeout) const
 {
     if(timeout == _timeout)
     {
+#ifdef ICE_CPP11_MAPPING
+        return dynamic_pointer_cast<IceInternal::EndpointI>(const_pointer_cast<IceInternal::EndpointI>(shared_from_this()));
+#else
         return const_cast<EndpointI*>(this);
+#endif
     }
     else
     {
-        return new EndpointI(_instance, _host, _port, _sourceAddr, timeout, _connectionId, _compress);
+        return ICE_MAKE_SHARED(EndpointI, _instance, _host, _port, _sourceAddr, timeout, _connectionId, _compress);
     }
 }
 
@@ -97,11 +115,15 @@ IceSSL::EndpointI::compress(bool compress) const
 {
     if(compress == _compress)
     {
+#ifdef ICE_CPP11_MAPPING
+        return dynamic_pointer_cast<IceInternal::EndpointI>(const_pointer_cast<IceInternal::EndpointI>(shared_from_this()));
+#else
         return const_cast<EndpointI*>(this);
+#endif
     }
     else
     {
-        return new EndpointI(_instance, _host, _port, _sourceAddr, _timeout, _connectionId, compress);
+        return ICE_MAKE_SHARED(EndpointI, _instance, _host, _port, _sourceAddr, _timeout, _connectionId, compress);
     }
 }
 
@@ -120,13 +142,19 @@ IceSSL::EndpointI::transceiver() const
 IceInternal::AcceptorPtr
 IceSSL::EndpointI::acceptor(const string& adapterName) const
 {
+#ifdef ICE_CPP11_MAPPING
+    return new AcceptorI(
+        dynamic_pointer_cast<EndpointI>(const_pointer_cast<IceInternal::EndpointI>(shared_from_this())),
+        _instance, adapterName, _host, _port);
+#else
     return new AcceptorI(const_cast<EndpointI*>(this), _instance, adapterName, _host, _port);
+#endif
 }
 
 EndpointIPtr
 IceSSL::EndpointI::endpoint(const AcceptorIPtr& acceptor) const
 {
-    return new EndpointI(_instance, _host, acceptor->effectivePort(), _sourceAddr, _timeout, _connectionId, _compress);
+    return ICE_MAKE_SHARED(EndpointI, _instance, _host, acceptor->effectivePort(), _sourceAddr, _timeout, _connectionId, _compress);
 }
 
 string
@@ -160,7 +188,11 @@ IceSSL::EndpointI::options() const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceSSL::EndpointI::operator==(const IceInternal::EndpointI& r) const
+#else
 IceSSL::EndpointI::operator==(const Ice::LocalObject& r) const
+#endif
 {
     if(!IPEndpointI::operator==(r))
     {
@@ -192,7 +224,11 @@ IceSSL::EndpointI::operator==(const Ice::LocalObject& r) const
 }
 
 bool
+#ifdef ICE_CPP11_MAPPING
+IceSSL::EndpointI::operator<(const IceInternal::EndpointI& r) const
+#else
 IceSSL::EndpointI::operator<(const Ice::LocalObject& r) const
+#endif
 {
     const EndpointI* p = dynamic_cast<const EndpointI*>(&r);
     if(!p)
@@ -319,7 +355,7 @@ IceSSL::EndpointI::createConnector(const IceInternal::Address& address, const Ic
 IceInternal::IPEndpointIPtr
 IceSSL::EndpointI::createEndpoint(const string& host, int port, const string& connectionId) const
 {
-    return new EndpointI(_instance, host, port, _sourceAddr, _timeout, connectionId, _compress);
+    return ICE_MAKE_SHARED(EndpointI, _instance, host, port, _sourceAddr, _timeout, connectionId, _compress);
 }
 
 IceSSL::EndpointFactoryI::EndpointFactoryI(const InstancePtr& instance) : _instance(instance)
@@ -345,7 +381,7 @@ IceSSL::EndpointFactoryI::protocol() const
 IceInternal::EndpointIPtr
 IceSSL::EndpointFactoryI::create(vector<string>& args, bool oaEndpoint) const
 {
-    IceInternal::IPEndpointIPtr endpt = new EndpointI(_instance);
+    IceInternal::IPEndpointIPtr endpt = ICE_MAKE_SHARED(EndpointI, _instance);
     endpt->initWithOptions(args, oaEndpoint);
     return endpt;
 }
@@ -353,7 +389,7 @@ IceSSL::EndpointFactoryI::create(vector<string>& args, bool oaEndpoint) const
 IceInternal::EndpointIPtr
 IceSSL::EndpointFactoryI::read(IceInternal::BasicStream* s) const
 {
-    return new EndpointI(_instance, s);
+    return ICE_MAKE_SHARED(EndpointI, _instance, s);
 }
 
 void
diff --git a/cpp/src/IceSSL/EndpointI.h b/cpp/src/IceSSL/EndpointI.h
index 74f04d1665a..25a23766b0b 100644
--- a/cpp/src/IceSSL/EndpointI.h
+++ b/cpp/src/IceSSL/EndpointI.h
@@ -10,6 +10,7 @@
 #ifndef ICE_SSL_ENDPOINT_I_H
 #define ICE_SSL_ENDPOINT_I_H
 
+#include <Ice/EndpointI.h>
 #include <Ice/IPEndpointI.h>
 #include <Ice/EndpointFactory.h>
 #include <Ice/WSEndpoint.h>
@@ -42,8 +43,13 @@ public:
     virtual IceInternal::AcceptorPtr acceptor(const std::string&) const;
     virtual std::string options() const;
 
+#ifdef ICE_CPP11_MAPPING
+    virtual bool operator==(const IceInternal::EndpointI&) const;
+    virtual bool operator<(const IceInternal::EndpointI&) const;
+#else
     virtual bool operator==(const Ice::LocalObject&) const;
     virtual bool operator<(const Ice::LocalObject&) const;
+#endif
 
     virtual EndpointIPtr endpoint(const AcceptorIPtr&) const;
 
diff --git a/cpp/src/IceSSL/InstanceF.h b/cpp/src/IceSSL/InstanceF.h
index 0c216ce2e5d..78f5ec916fc 100644
--- a/cpp/src/IceSSL/InstanceF.h
+++ b/cpp/src/IceSSL/InstanceF.h
@@ -22,8 +22,12 @@ IceUtil::Shared* upCast(Instance*);
 typedef IceInternal::Handle<Instance> InstancePtr;
 
 class EndpointI;
+#ifdef ICE_CPP11_MAPPING
+typedef ::std::shared_ptr<EndpointI> EndpointIPtr;
+#else
 IceUtil::Shared* upCast(EndpointI*);
 typedef IceInternal::Handle<EndpointI> EndpointIPtr;
+#endif
 
 class AcceptorI;
 IceUtil::Shared* upCast(AcceptorI*);
diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
index ff9563db0de..22856132b76 100644
--- a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
+++ b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
@@ -279,7 +279,11 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B
         _verified = true;
     }
 
+#ifdef ICE_CPP11_MAPPING
+    _engine->verifyPeer(_stream->fd(), _host, dynamic_pointer_cast<NativeConnectionInfo>(getInfo()));
+#else
     _engine->verifyPeer(_stream->fd(), _host, NativeConnectionInfoPtr::dynamicCast(getInfo()));
+#endif
 
     if(_engine->securityTraceLevel() >= 1)
     {
@@ -571,7 +575,7 @@ IceSSL::TransceiverI::toDetailedString() const
 Ice::ConnectionInfoPtr
 IceSSL::TransceiverI::getInfo() const
 {
-    NativeConnectionInfoPtr info = new NativeConnectionInfo();
+    NativeConnectionInfoPtr info = ICE_MAKE_SHARED(NativeConnectionInfo);
     fillConnectionInfo(info, info->nativeCerts);
     return info;
 }
@@ -579,7 +583,7 @@ IceSSL::TransceiverI::getInfo() const
 Ice::ConnectionInfoPtr
 IceSSL::TransceiverI::getWSInfo(const Ice::HeaderDict& headers) const
 {
-    WSSNativeConnectionInfoPtr info = new WSSNativeConnectionInfo();
+    WSSNativeConnectionInfoPtr info = ICE_MAKE_SHARED(WSSNativeConnectionInfo);
     fillConnectionInfo(info, info->nativeCerts);
     info->headers = headers;
     return info;
@@ -627,7 +631,7 @@ IceSSL::TransceiverI::verifyCallback(int ok, X509_STORE_CTX* c)
         _nativeCerts.clear();
         for(int i = 0; i < sk_X509_num(chain); ++i)
         {
-            _nativeCerts.push_back(new Certificate(X509_dup(sk_X509_value(chain, i))));
+            _nativeCerts.push_back(ICE_MAKE_SHARED(Certificate, X509_dup(sk_X509_value(chain, i))));
         }
         sk_X509_pop_free(chain, X509_free);
     }
diff --git a/cpp/src/IceSSL/SChannelTransceiverI.cpp b/cpp/src/IceSSL/SChannelTransceiverI.cpp
index 238bf3981da..792a283db8b 100644
--- a/cpp/src/IceSSL/SChannelTransceiverI.cpp
+++ b/cpp/src/IceSSL/SChannelTransceiverI.cpp
@@ -715,7 +715,7 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B
         }
     }
 
-    _engine->verifyPeer(_stream->fd(), _host, NativeConnectionInfoPtr::dynamicCast(getInfo()));
+    _engine->verifyPeer(_stream->fd(), _host, ICE_DYNAMIC_CAST(NativeConnectionInfo, getInfo()));
     _state = StateHandshakeComplete;
 
     if(_instance->engine()->securityTraceLevel() >= 1)
@@ -958,7 +958,7 @@ IceSSL::TransceiverI::toDetailedString() const
 Ice::ConnectionInfoPtr
 IceSSL::TransceiverI::getInfo() const
 {
-    NativeConnectionInfoPtr info = new NativeConnectionInfo();
+    NativeConnectionInfoPtr info = ICE_MAKE_SHARED(NativeConnectionInfo);
     fillConnectionInfo(info, info->nativeCerts);
     return info;
 }
@@ -966,7 +966,7 @@ IceSSL::TransceiverI::getInfo() const
 Ice::ConnectionInfoPtr
 IceSSL::TransceiverI::getWSInfo(const Ice::HeaderDict& headers) const
 {
-    WSSNativeConnectionInfoPtr info = new WSSNativeConnectionInfo();
+    WSSNativeConnectionInfoPtr info = ICE_MAKE_SHARED(WSSNativeConnectionInfo);
     fillConnectionInfo(info, info->nativeCerts);
     info->headers = headers;
     return info;
@@ -1051,7 +1051,7 @@ IceSSL::TransceiverI::fillConnectionInfo(const ConnectionInfoPtr& info, vector<C
                                                 IceUtilInternal::lastErrorToString());
                     }
 
-                    CertificatePtr certificate = new Certificate(cc);
+                    CertificatePtr certificate = ICE_MAKE_SHARED(Certificate, cc);
                     nativeCerts.push_back(certificate);
                     info->certs.push_back(certificate->encode());
                 }
diff --git a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
index 08bce7548a1..99f4571224e 100644
--- a/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
+++ b/cpp/src/IceSSL/SecureTransportTransceiverI.cpp
@@ -258,7 +258,7 @@ IceSSL::TransceiverI::initialize(IceInternal::Buffer& readBuffer, IceInternal::B
            << "remote address = " << desc << "\n" << errorToString(err);
         throw ProtocolException(__FILE__, __LINE__, os.str());
     }
-    _engine->verifyPeer(_stream->fd(), _host, NativeConnectionInfoPtr::dynamicCast(getInfo()));
+    _engine->verifyPeer(_stream->fd(), _host, ICE_DYNAMIC_CAST(NativeConnectionInfo, getInfo()));
 
     if(_instance->engine()->securityTraceLevel() >= 1)
     {
@@ -484,7 +484,7 @@ IceSSL::TransceiverI::toDetailedString() const
 Ice::ConnectionInfoPtr
 IceSSL::TransceiverI::getInfo() const
 {
-    NativeConnectionInfoPtr info = new NativeConnectionInfo();
+    NativeConnectionInfoPtr info = ICE_MAKE_SHARED(NativeConnectionInfo);
     fillConnectionInfo(info, info->nativeCerts);
     return info;
 }
@@ -492,7 +492,7 @@ IceSSL::TransceiverI::getInfo() const
 Ice::ConnectionInfoPtr
 IceSSL::TransceiverI::getWSInfo(const Ice::HeaderDict& headers) const
 {
-    WSSNativeConnectionInfoPtr info = new WSSNativeConnectionInfo();
+    WSSNativeConnectionInfoPtr info = ICE_MAKE_SHARED(WSSNativeConnectionInfo);
     fillConnectionInfo(info, info->nativeCerts);
     info->headers = headers;
     return info;
@@ -554,7 +554,7 @@ IceSSL::TransceiverI::fillConnectionInfo(const ConnectionInfoPtr& info, std::vec
             SecCertificateRef cert = SecTrustGetCertificateAtIndex(_trust, i);
             CFRetain(cert);
 
-            CertificatePtr certificate = new Certificate(cert);
+            CertificatePtr certificate = ICE_MAKE_SHARED(Certificate, cert);
             nativeCerts.push_back(certificate);
             info->certs.push_back(certificate->encode());
         }
diff --git a/cpp/src/IceStorm/.depend.mak b/cpp/src/IceStorm/.depend.mak
index e1aabecdb24..a2378c1a17a 100755
--- a/cpp/src/IceStorm/.depend.mak
+++ b/cpp/src/IceStorm/.depend.mak
@@ -96,6 +96,7 @@ Instance.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +105,7 @@ Instance.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -138,7 +140,7 @@ Instance.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -148,13 +150,13 @@ Instance.obj: \
     "Election.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "SubscriberRecord.h" \
     "$(includedir)\IceStorm\IceStorm.h" \
@@ -204,7 +206,6 @@ Instance.obj: \
     "$(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" \
@@ -246,6 +247,7 @@ InstrumentationI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -254,6 +256,7 @@ InstrumentationI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\EndpointF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -289,7 +292,7 @@ InstrumentationI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -299,13 +302,13 @@ InstrumentationI.obj: \
     "$(includedir)\Ice\Metrics.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\MetricsAdminI.h" \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\IncomingAsync.h" \
@@ -372,6 +375,7 @@ NodeI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -379,6 +383,7 @@ NodeI.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -407,7 +412,7 @@ NodeI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -420,6 +425,7 @@ NodeI.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -431,7 +437,6 @@ NodeI.obj: \
     "$(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" \
@@ -453,7 +458,6 @@ NodeI.obj: \
     "$(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" \
@@ -494,6 +498,7 @@ Observers.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -502,6 +507,7 @@ Observers.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -542,7 +548,7 @@ Observers.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -556,6 +562,7 @@ Observers.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -567,7 +574,6 @@ Observers.obj: \
     "$(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" \
@@ -590,7 +596,6 @@ Observers.obj: \
     "$(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" \
@@ -632,6 +637,7 @@ Service.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -640,6 +646,7 @@ Service.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\LoggerF.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -679,7 +686,7 @@ Service.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -688,13 +695,13 @@ Service.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceStorm\IceStorm.h" \
     "$(includedir)\Ice\SliceChecksumDict.h" \
     "$(includedir)\IceStorm\Metrics.h" \
@@ -743,7 +750,6 @@ Service.obj: \
     "$(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" \
@@ -788,6 +794,7 @@ Subscriber.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -796,6 +803,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -830,7 +838,7 @@ Subscriber.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -839,13 +847,13 @@ Subscriber.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceStorm\IceStorm.h" \
     "$(includedir)\Ice\SliceChecksumDict.h" \
     "$(includedir)\IceStorm\Metrics.h" \
@@ -899,7 +907,6 @@ Subscriber.obj: \
     "$(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" \
@@ -930,6 +937,7 @@ TopicI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -938,6 +946,7 @@ TopicI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -972,7 +981,7 @@ TopicI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -981,13 +990,13 @@ TopicI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceStorm\IceStorm.h" \
     "$(includedir)\Ice\SliceChecksumDict.h" \
     "$(includedir)\IceStorm\Metrics.h" \
@@ -1039,7 +1048,6 @@ TopicI.obj: \
     "$(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" \
@@ -1074,6 +1082,7 @@ TopicManagerI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1082,6 +1091,7 @@ TopicManagerI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1116,7 +1126,7 @@ TopicManagerI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1125,13 +1135,13 @@ TopicManagerI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\SliceChecksumDict.h" \
     "$(includedir)\IceStorm\Metrics.h" \
     "$(includedir)\Ice\Metrics.h" \
@@ -1178,7 +1188,6 @@ TopicManagerI.obj: \
     "$(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" \
@@ -1219,6 +1228,7 @@ TraceLevels.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1227,6 +1237,7 @@ TraceLevels.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1261,7 +1272,7 @@ TraceLevels.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1272,6 +1283,7 @@ TraceLevels.obj: \
     "$(includedir)\Ice\Properties.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1295,6 +1307,7 @@ TransientTopicI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1303,6 +1316,7 @@ TransientTopicI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1337,7 +1351,7 @@ TransientTopicI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1346,13 +1360,13 @@ TransientTopicI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceStorm\IceStorm.h" \
     "$(includedir)\Ice\SliceChecksumDict.h" \
     "$(includedir)\IceStorm\Metrics.h" \
@@ -1405,7 +1419,6 @@ TransientTopicI.obj: \
     "$(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" \
@@ -1433,6 +1446,7 @@ TransientTopicManagerI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1441,6 +1455,7 @@ TransientTopicManagerI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1475,7 +1490,7 @@ TransientTopicManagerI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1484,13 +1499,13 @@ TransientTopicManagerI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceStorm\IceStorm.h" \
     "$(includedir)\Ice\SliceChecksumDict.h" \
     "$(includedir)\IceStorm\Metrics.h" \
@@ -1545,7 +1560,6 @@ TransientTopicManagerI.obj: \
     "$(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" \
@@ -1574,6 +1588,7 @@ Util.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1582,6 +1597,7 @@ Util.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1622,7 +1638,7 @@ Util.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1636,6 +1652,7 @@ Util.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1647,7 +1664,6 @@ Util.obj: \
     "$(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" \
@@ -1670,7 +1686,6 @@ Util.obj: \
     "$(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" \
@@ -1704,6 +1719,7 @@ Election.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1712,6 +1728,7 @@ Election.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1746,7 +1763,7 @@ Election.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1755,13 +1772,13 @@ Election.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "SubscriberRecord.h" \
     "$(includedir)\IceStorm\IceStorm.h" \
@@ -1791,6 +1808,7 @@ IceStormInternal.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1799,6 +1817,7 @@ IceStormInternal.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1833,7 +1852,7 @@ IceStormInternal.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1842,13 +1861,13 @@ IceStormInternal.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceStorm\IceStorm.h" \
     "$(includedir)\Ice\SliceChecksumDict.h" \
     "$(includedir)\IceStorm\Metrics.h" \
@@ -1879,6 +1898,7 @@ Instrumentation.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1887,6 +1907,7 @@ Instrumentation.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1921,7 +1942,7 @@ Instrumentation.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1930,13 +1951,13 @@ Instrumentation.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceStorm\IceStorm.h" \
     "$(includedir)\Ice\SliceChecksumDict.h" \
     "$(includedir)\IceStorm\Metrics.h" \
@@ -1964,6 +1985,7 @@ LinkRecord.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1972,6 +1994,7 @@ LinkRecord.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -2006,7 +2029,7 @@ LinkRecord.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2015,13 +2038,13 @@ LinkRecord.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "IceStormInternal.h" \
     "$(includedir)\IceStorm\IceStorm.h" \
     "$(includedir)\Ice\SliceChecksumDict.h" \
@@ -2053,6 +2076,7 @@ LLURecord.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2061,6 +2085,7 @@ LLURecord.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -2079,7 +2104,7 @@ LLURecord.obj: \
     "$(includedir)\Ice\ConnectionF.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\Ice\Version.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2101,6 +2126,7 @@ SubscriberRecord.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2109,6 +2135,7 @@ SubscriberRecord.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -2143,7 +2170,7 @@ SubscriberRecord.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2152,13 +2179,13 @@ SubscriberRecord.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\IceStorm\IceStorm.h" \
     "$(includedir)\Ice\SliceChecksumDict.h" \
     "$(includedir)\IceStorm\Metrics.h" \
@@ -2195,6 +2222,7 @@ Admin.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2203,6 +2231,7 @@ Admin.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -2239,7 +2268,7 @@ Admin.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2253,6 +2282,7 @@ Admin.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -2264,7 +2294,6 @@ Admin.obj: \
     "$(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" \
@@ -2286,7 +2315,6 @@ Admin.obj: \
     "$(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" \
@@ -2317,6 +2345,7 @@ Parser.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2325,6 +2354,7 @@ Parser.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -2365,7 +2395,7 @@ Parser.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2379,6 +2409,7 @@ Parser.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -2390,7 +2421,6 @@ Parser.obj: \
     "$(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" \
@@ -2413,7 +2443,6 @@ Parser.obj: \
     "$(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" \
@@ -2447,6 +2476,7 @@ Grammar.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2455,6 +2485,7 @@ Grammar.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -2495,7 +2526,7 @@ Grammar.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2509,6 +2540,7 @@ Grammar.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -2520,7 +2552,6 @@ Grammar.obj: \
     "$(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" \
@@ -2543,7 +2574,6 @@ Grammar.obj: \
     "$(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" \
@@ -2574,6 +2604,7 @@ Scanner.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2582,6 +2613,7 @@ Scanner.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -2622,7 +2654,7 @@ Scanner.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2636,6 +2668,7 @@ Scanner.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -2647,7 +2680,6 @@ Scanner.obj: \
     "$(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" \
@@ -2670,7 +2702,6 @@ Scanner.obj: \
     "$(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" \
@@ -2708,6 +2739,7 @@ IceStormDB.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2716,6 +2748,7 @@ IceStormDB.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -2752,7 +2785,7 @@ IceStormDB.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2766,6 +2799,7 @@ IceStormDB.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -2777,7 +2811,6 @@ IceStormDB.obj: \
     "$(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" \
@@ -2799,7 +2832,6 @@ IceStormDB.obj: \
     "$(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" \
@@ -2835,6 +2867,7 @@ DBTypes.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -2843,6 +2876,7 @@ DBTypes.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -2877,7 +2911,7 @@ DBTypes.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -2886,13 +2920,13 @@ DBTypes.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.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" \
diff --git a/cpp/src/IceStormLib/.depend.mak b/cpp/src/IceStormLib/.depend.mak
index 90076091925..de2c3789856 100755
--- a/cpp/src/IceStormLib/.depend.mak
+++ b/cpp/src/IceStormLib/.depend.mak
@@ -26,6 +26,7 @@ IceStorm.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -34,6 +35,7 @@ IceStorm.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -68,7 +70,7 @@ IceStorm.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -77,13 +79,13 @@ IceStorm.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\SliceChecksumDict.h" \
     "$(includedir)\IceStorm\Metrics.h" \
     "$(includedir)\Ice\Metrics.h" \
@@ -111,6 +113,7 @@ Metrics.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -119,6 +122,7 @@ Metrics.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -153,7 +157,7 @@ Metrics.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -162,13 +166,13 @@ Metrics.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Metrics.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\IceStorm\Config.h" \
diff --git a/cpp/src/Makefile b/cpp/src/Makefile
index 7ed1b7f07f8..0b4354e707a 100644
--- a/cpp/src/Makefile
+++ b/cpp/src/Makefile
@@ -11,6 +11,14 @@ top_srcdir	= ..
 
 include $(top_srcdir)/config/Make.rules
 
+ifeq ($(CPP11_MAPPING),yes)
+    SUBDIRS	= IceUtil \
+		  Slice \
+		  slice2cpp \
+		  Ice \
+		  IceSSL
+else
+
 ifneq ($(findstring MINGW,$(UNAME)),)
     SUBDIRS	= IceUtil \
 		  Slice \
@@ -51,6 +59,7 @@ endif
 		   IceStorm \
 		   IceGrid
 endif
+endif
 
 .PHONY: $(EVERYTHING) $(SUBDIRS)
 
diff --git a/cpp/src/Makefile.mak b/cpp/src/Makefile.mak
index daefee51925..204980bcc3e 100644
--- a/cpp/src/Makefile.mak
+++ b/cpp/src/Makefile.mak
@@ -18,7 +18,12 @@ SUBDIRS_WINRT	= IceUtil\winrt \
 		  Glacier2Lib\winrt \
 		  IceStormLib\winrt \
 		  IceGridLib\winrt
-
+!elseif "$(CPP11_MAPPING)" == "yes"
+SUBDIRS		= IceUtil \
+		  Slice \
+		  slice2cpp \
+		  Ice \
+		  IceSSL
 !elseif "$(CPP_COMPILER)" == "VC100"
 SUBDIRS		= IceUtil \
 		  Slice \
diff --git a/cpp/src/Slice/CPlusPlusUtil.cpp b/cpp/src/Slice/CPlusPlusUtil.cpp
index e50b4908eab..474976e89f0 100644
--- a/cpp/src/Slice/CPlusPlusUtil.cpp
+++ b/cpp/src/Slice/CPlusPlusUtil.cpp
@@ -48,14 +48,7 @@ stringTypeToString(const TypePtr& type, const StringList& metaData, int typeCtx)
     string strType = findMetaData(metaData, typeCtx);
     if(strType == "wstring" || (typeCtx & TypeContextUseWstring && strType == ""))
     {
-        if(featureProfile == IceE)
-        {
-            return "::Ice::Wstring";
-        }
-        else
-        {
-            return "::std::wstring";
-        }
+        return "::std::wstring";
     }
     else if(strType != "" && strType != "string")
     {
@@ -151,9 +144,9 @@ dictionaryTypeToString(const DictionaryPtr& dict, const StringList& metaData, in
 
 void
 writeParamAllocateCode(Output& out, const TypePtr& type, bool optional, const string& fixedName,
-                       const StringList& metaData, int typeCtx, bool endArg)
+                       const StringList& metaData, int typeCtx, bool cpp11, bool endArg)
 {
-    string s = typeToString(type, metaData, typeCtx);
+    string s = typeToString(type, metaData, typeCtx, cpp11);
     if(optional)
     {
         s = "IceUtil::Optional<" + toTemplateArg(s) + '>';
@@ -181,7 +174,7 @@ writeParamAllocateCode(Output& out, const TypePtr& type, bool optional, const st
         string s;
         if(seqType == "%array")
         {
-            s = typeToString(seq, metaData, TypeContextAMIPrivateEnd);
+            s = typeToString(seq, metaData, TypeContextAMIPrivateEnd, cpp11);
         }
         else if(seqType.find("%range") == 0)
         {
@@ -190,7 +183,7 @@ writeParamAllocateCode(Output& out, const TypePtr& type, bool optional, const st
             {
                 md.push_back("cpp:type:" + seqType.substr(strlen("%range:")));
             }
-            s = typeToString(seq, md);
+            s = typeToString(seq, md, 0, cpp11);
         }
 
         if(!s.empty())
@@ -450,9 +443,33 @@ Slice::printDllExportStuff(Output& out, const string& dllExport)
     }
 }
 
+bool
+Slice::isMovable(const TypePtr& type)
+{
+    BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
+    if(builtin)
+    {
+        switch(builtin->kind())
+        {
+            case Builtin::KindString:
+            case Builtin::KindObject:
+            case Builtin::KindObjectProxy:
+            case Builtin::KindLocalObject:
+            case Builtin::KindValue:
+            {
+                return true;
+            }
+            default:
+            {
+                return false;
+            }
+        }
+    }
+    return !EnumPtr::dynamicCast(type);
+}
 
 string
-Slice::typeToString(const TypePtr& type, const StringList& metaData, int typeCtx)
+Slice::typeToString(const TypePtr& type, const StringList& metaData, int typeCtx, bool cpp11)
 {
     static const char* builtinTable[] =
     {
@@ -466,7 +483,24 @@ Slice::typeToString(const TypePtr& type, const StringList& metaData, int typeCtx
         "::std::string",
         "::Ice::ObjectPtr",
         "::Ice::ObjectPrx",
-        "::Ice::LocalObjectPtr"
+        "::Ice::LocalObjectPtr",
+        "::Ice::ValuePtr"
+    };
+    
+    static const char* cpp11BuiltinTable[] =
+    {
+        "::Ice::Byte",
+        "bool",
+        "short",
+        "int",
+        "long long int",
+        "float",
+        "double",
+        "::std::string",
+        "::std::shared_ptr<::Ice::Object>",
+        "::std::shared_ptr<::Ice::ObjectPrx>",
+        "::std::shared_ptr<void>",
+        "::std::shared_ptr<::Ice::Value>"
     };
 
     BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
@@ -478,20 +512,48 @@ Slice::typeToString(const TypePtr& type, const StringList& metaData, int typeCtx
         }
         else
         {
-            return builtinTable[builtin->kind()];
+            return cpp11 ? cpp11BuiltinTable[builtin->kind()] : builtinTable[builtin->kind()];
         }
     }
 
     ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
     if(cl)
     {
-        return fixKwd(cl->scoped() + "Ptr");
+        //
+        // C++11 mapping accepts cpp11:type metadata for classes and proxies
+        //
+        if(cpp11)
+        {
+            string t;
+            if(cpp11 && findMetaData("cpp11:type:", cl, t))
+            {
+                return t;
+            }
+            else
+            {
+                if(cl->isInterface() && !cl->isLocal())
+                {
+                    return "std::shared_ptr<::Ice::Value>";
+                }
+                else
+                {
+                    return "::std::shared_ptr<" + cl->scoped() + ">";
+                }
+            }
+        }
+        else
+        {
+            return cl->scoped() + "Ptr";
+        }
     }
 
     StructPtr st = StructPtr::dynamicCast(type);
     if(st)
     {
-        if(findMetaData(st->getMetaData()) == "%class")
+        //
+        // C++11 mapping doesn't accept cpp:class metdata
+        //
+        if(!cpp11 && findMetaData(st->getMetaData()) == "%class")
         {
             return fixKwd(st->scoped() + "Ptr");
         }
@@ -501,7 +563,14 @@ Slice::typeToString(const TypePtr& type, const StringList& metaData, int typeCtx
     ProxyPtr proxy = ProxyPtr::dynamicCast(type);
     if(proxy)
     {
-        return fixKwd(proxy->_class()->scoped() + "Prx");
+        if(cpp11)
+        {
+            return "::std::shared_ptr<" + fixKwd(proxy->_class()->scoped() + "Prx") + ">";
+        }
+        else
+        {
+            return fixKwd(proxy->_class()->scoped() + "Prx");
+        }
     }
 
     SequencePtr seq = SequencePtr::dynamicCast(type);
@@ -532,7 +601,7 @@ Slice::typeToString(const TypePtr& type, const StringList& metaData, int typeCtx
 }
 
 string
-Slice::typeToString(const TypePtr& type, bool optional, const StringList& metaData, int typeCtx)
+Slice::typeToString(const TypePtr& type, bool optional, const StringList& metaData, int typeCtx, bool cpp11)
 {
     if(optional)
     {
@@ -540,12 +609,12 @@ Slice::typeToString(const TypePtr& type, bool optional, const StringList& metaDa
     }
     else
     {
-        return typeToString(type, metaData, typeCtx);
+        return typeToString(type, metaData, typeCtx, cpp11);
     }
 }
 
 string
-Slice::returnTypeToString(const TypePtr& type, bool optional, const StringList& metaData, int typeCtx)
+Slice::returnTypeToString(const TypePtr& type, bool optional, const StringList& metaData, int typeCtx, bool cpp11)
 {
     if(!type)
     {
@@ -557,11 +626,11 @@ Slice::returnTypeToString(const TypePtr& type, bool optional, const StringList&
         return "IceUtil::Optional<" + toTemplateArg(typeToString(type, metaData, typeCtx)) + ">";
     }
 
-    return typeToString(type, metaData, typeCtx);
+    return typeToString(type, metaData, typeCtx, cpp11);
 }
 
 string
-Slice::inputTypeToString(const TypePtr& type, bool optional, const StringList& metaData, int typeCtx)
+Slice::inputTypeToString(const TypePtr& type, bool optional, const StringList& metaData, int typeCtx, bool cpp11)
 {
     static const char* inputBuiltinTable[] =
     {
@@ -575,7 +644,24 @@ Slice::inputTypeToString(const TypePtr& type, bool optional, const StringList& m
         "const ::std::string&",
         "const ::Ice::ObjectPtr&",
         "const ::Ice::ObjectPrx&",
-        "const ::Ice::LocalObjectPtr&"
+        "const ::Ice::LocalObjectPtr&",
+        "const ::Ice::ValuePtr&"
+    };
+    
+    static const char* cpp1InputBuiltinTable[] =
+    {
+        "::Ice::Byte",
+        "bool",
+        "short",
+        "int",
+        "long long int",
+        "float",
+        "double",
+        "const ::std::string&",
+        "const ::Ice::ObjectPtr&",
+        "const ::std::shared_ptr<::Ice::ObjectPrx>&",
+        "const ::std::shared_ptr<void>&",
+        "const ::Ice::ValuePtr&"
     };
 
     typeCtx |= TypeContextInParam;
@@ -594,20 +680,39 @@ Slice::inputTypeToString(const TypePtr& type, bool optional, const StringList& m
         }
         else
         {
-            return inputBuiltinTable[builtin->kind()];
+            return cpp11 ? cpp1InputBuiltinTable[builtin->kind()] : inputBuiltinTable[builtin->kind()];
         }
     }
 
     ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
     if(cl)
     {
-        return "const " + fixKwd(cl->scoped() + "Ptr&");
+        string t;
+        if(cpp11)
+        {
+            if(findMetaData("cpp11:type:", cl, t))
+            {
+                return t;
+            }
+            else if(cl->isInterface() && !cl->isLocal())
+            {
+                return "const ::Ice::ValuePtr&";
+            }
+            else
+            {
+                return "const ::std::shared_ptr<" + fixKwd(cl->scoped()) + ">&";
+            }
+        }
+        else
+        {
+            return "const " + fixKwd(cl->scoped() + "Ptr&");
+        }
     }
 
     StructPtr st = StructPtr::dynamicCast(type);
     if(st)
     {
-        if(findMetaData(st->getMetaData()) == "%class")
+        if(!cpp11 && findMetaData(st->getMetaData()) == "%class")
         {
             return "const " + fixKwd(st->scoped() + "Ptr&");
         }
@@ -617,7 +722,14 @@ Slice::inputTypeToString(const TypePtr& type, bool optional, const StringList& m
     ProxyPtr proxy = ProxyPtr::dynamicCast(type);
     if(proxy)
     {
-        return "const " + fixKwd(proxy->_class()->scoped() + "Prx&");
+        if(cpp11)
+        {
+            return "const ::std::shared_ptr<" + fixKwd(proxy->_class()->scoped() + "Prx") + ">&";
+        }
+        else
+        {
+            return "const " + fixKwd(proxy->_class()->scoped() + "Prx&");
+        }
     }
 
     EnumPtr en = EnumPtr::dynamicCast(type);
@@ -648,7 +760,7 @@ Slice::inputTypeToString(const TypePtr& type, bool optional, const StringList& m
 }
 
 string
-Slice::outputTypeToString(const TypePtr& type, bool optional, const StringList& metaData, int typeCtx)
+Slice::outputTypeToString(const TypePtr& type, bool optional, const StringList& metaData, int typeCtx, bool cpp11)
 {
     static const char* outputBuiltinTable[] =
     {
@@ -661,8 +773,25 @@ Slice::outputTypeToString(const TypePtr& type, bool optional, const StringList&
         "::Ice::Double&",
         "::std::string&",
         "::Ice::ObjectPtr&",
-        "::Ice::ObjectPrx&",
-        "::Ice::LocalObjectPtr&"
+        "::Ice::ObjectPrxPtr&",
+        "::Ice::LocalObjectPtr&",
+        "::Ice::ValuePtr&"
+    };
+    
+    static const char* cpp11OutputBuiltinTable[] =
+    {
+        "::Ice::Byte&",
+        "bool&",
+        "short&",
+        "int&",
+        "long long int&",
+        "float&",
+        "double&",
+        "::std::string&",
+        "::std::shared_ptr<::Ice::Object>&",
+        "::std::shared_ptr<::Ice::ObjectPrx>&",
+        "::std::shared_ptr<void>&",
+        "::std::shared_ptr<::Ice::Value>&"
     };
 
     if(optional)
@@ -679,30 +808,54 @@ Slice::outputTypeToString(const TypePtr& type, bool optional, const StringList&
         }
         else
         {
-            return outputBuiltinTable[builtin->kind()];
+            return cpp11 ? cpp11OutputBuiltinTable[builtin->kind()] : outputBuiltinTable[builtin->kind()];
         }
     }
 
     ClassDeclPtr cl = ClassDeclPtr::dynamicCast(type);
     if(cl)
     {
-        return fixKwd(cl->scoped() + "Ptr&");
+        if(cpp11)
+        {
+            if(cl->isInterface() && !cl->isLocal())
+            {
+                return "::std::shared_ptr<::Ice::Value>&";
+            }
+            else
+            {
+                return "::std::shared_ptr<" + fixKwd(cl->scoped()) + ">&";
+            }
+        }
+        else
+        {
+            return fixKwd(cl->scoped() + "Ptr&");
+        }
     }
 
     StructPtr st = StructPtr::dynamicCast(type);
     if(st)
     {
-        if(findMetaData(st->getMetaData()) == "%class")
+        if(!cpp11 && findMetaData(st->getMetaData()) == "%class")
         {
             return fixKwd(st->scoped() + "Ptr&");
         }
-        return fixKwd(st->scoped()) + "&";
+        else
+        {
+            return fixKwd(st->scoped()) + "&";
+        }
     }
 
     ProxyPtr proxy = ProxyPtr::dynamicCast(type);
     if(proxy)
     {
-        return fixKwd(proxy->_class()->scoped() + "Prx&");
+        if(cpp11)
+        {
+            return "::std::shared_ptr<" + fixKwd(proxy->_class()->scoped() + "Prx>&");
+        }
+        else
+        {
+            return fixKwd(proxy->_class()->scoped() + "Prx&");
+        }
     }
 
     SequencePtr seq = SequencePtr::dynamicCast(type);
@@ -727,23 +880,23 @@ Slice::outputTypeToString(const TypePtr& type, bool optional, const StringList&
 }
 
 string
-Slice::operationModeToString(Operation::Mode mode)
+Slice::operationModeToString(Operation::Mode mode, bool cpp11)
 {
     switch(mode)
     {
         case Operation::Normal:
         {
-            return "::Ice::Normal";
+            return cpp11 ? "::Ice::OperationMode::Normal" : "::Ice::Normal";
         }
 
         case Operation::Nonmutating:
         {
-            return "::Ice::Nonmutating";
+            return cpp11 ? "::Ice::OperationMode::Nonmutating" : "::Ice::Nonmutating";
         }
 
         case Operation::Idempotent:
         {
-            return "::Ice::Idempotent";
+            return cpp11 ? "::Ice::OperationMode::Idempotent" : "::Ice::Idempotent";
         }
 
         default:
@@ -949,17 +1102,17 @@ Slice::writeUnmarshalCode(Output& out, const ParamDeclList& params, const Operat
 }
 
 void
-Slice::writeAllocateCode(Output& out, const ParamDeclList& params, const OperationPtr& op, bool prepend, int typeCtx)
+Slice::writeAllocateCode(Output& out, const ParamDeclList& params, const OperationPtr& op, bool prepend, int typeCtx, bool cpp11)
 {
     string prefix = prepend ? paramPrefix : "";
     for(ParamDeclList::const_iterator p = params.begin(); p != params.end(); ++p)
     {
         writeParamAllocateCode(out, (*p)->type(), (*p)->optional(), fixKwd(prefix + (*p)->name()), (*p)->getMetaData(),
-                               typeCtx, getEndArg((*p)->type(),(*p)->getMetaData(), (*p)->name()) != (*p)->name());
+                               typeCtx, cpp11, getEndArg((*p)->type(),(*p)->getMetaData(), (*p)->name()) != (*p)->name());
     }
     if(op && op->returnType())
     {
-        writeParamAllocateCode(out, op->returnType(), op->returnIsOptional(), "__ret", op->getMetaData(), typeCtx,
+        writeParamAllocateCode(out, op->returnType(), op->returnIsOptional(), "__ret", op->getMetaData(), typeCtx, cpp11,
                                getEndArg(op->returnType(), op->getMetaData(), "__ret") != "__ret");
     }
 }
@@ -1020,6 +1173,33 @@ Slice::writeEndCode(Output& out, const ParamDeclList& params, const OperationPtr
     }
 }
 
+bool
+Slice::findMetaData(const string& prefix, const ClassDeclPtr& cl, string& value)
+{
+    if(findMetaData(prefix, cl->getMetaData(), value))
+    {
+        return true;
+    }
+    
+    ClassDefPtr def = cl->definition();
+    return def ? findMetaData(prefix, def->getMetaData(), value) : false;
+}
+
+bool
+Slice::findMetaData(const string& prefix, const StringList& metaData, string& value)
+{
+    for(StringList::const_iterator i = metaData.begin(); i != metaData.end(); i++)
+    {
+        string s = *i;
+        if(s.find(prefix) == 0)
+        {
+            value = s.substr(prefix.size());
+            return true;
+        }
+    }
+    return false;
+}
+
 string
 Slice::findMetaData(const StringList& metaData, int typeCtx)
 {
@@ -1084,7 +1264,7 @@ Slice::findMetaData(const StringList& metaData, int typeCtx)
                 }
             }
             //
-            // Otherwise if the data is "class" it is returned.
+            // Otherwise if the data is "class", "unscoped" it is returned.
             //
             else
             {
@@ -1093,6 +1273,10 @@ Slice::findMetaData(const StringList& metaData, int typeCtx)
                 {
                     return "%class";
                 }
+                else if(ss == "unscoped")
+                {
+                    return "%unscoped";
+                }
             }
         }
     }
diff --git a/cpp/src/Slice/CsUtil.cpp b/cpp/src/Slice/CsUtil.cpp
index c72137ae53c..a1ab2fc869a 100644
--- a/cpp/src/Slice/CsUtil.cpp
+++ b/cpp/src/Slice/CsUtil.cpp
@@ -191,6 +191,10 @@ Slice::CsGenerator::getOptionalFormat(const TypePtr& type)
             assert(false);
             break;
         }
+        case Builtin::KindValue:
+        {
+            return "Ice.OptionalFormat.Class";
+        }
         }
     }
 
@@ -552,6 +556,7 @@ Slice::CsGenerator::writeMarshalUnmarshalCode(Output &out,
                 break;
             }
             case Builtin::KindObject:
+            case Builtin::KindValue:
             {
                 if(marshal)
                 {
@@ -835,6 +840,7 @@ Slice::CsGenerator::writeOptionalMarshalUnmarshalCode(Output &out,
                 break;
             }
             case Builtin::KindObject:
+            case Builtin::KindValue:
             {
                 if(marshal)
                 {
@@ -1138,6 +1144,7 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
     {
         switch(builtin->kind())
         {
+            case Builtin::KindValue:
             case Builtin::KindObject:
             case Builtin::KindObjectProxy:
             {
@@ -1170,7 +1177,8 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                                 << "> e__ = " << param << ".GetEnumerator();";
                             out << nl << "while(e__.MoveNext())";
                             out << sb;
-                            string func = builtin->kind() == Builtin::KindObject ? "writeObject" : "writeProxy";
+                            string func = (builtin->kind() == Builtin::KindObject || 
+                                           builtin->kind() == Builtin::KindValue) ? "writeObject" : "writeProxy";
                             out << nl << stream << '.' << func << "(e__.Current);";
                             out << eb;
                         }
@@ -1179,7 +1187,8 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                     {
                         out << nl << "for(int ix__ = 0; ix__ < " << param << '.' << limitID << "; ++ix__)";
                         out << sb;
-                        string func = builtin->kind() == Builtin::KindObject ? "writeObject" : "writeProxy";
+                        string func = (builtin->kind() == Builtin::KindObject ||
+                                       builtin->kind() == Builtin::KindValue) ? "writeObject" : "writeProxy";
                         out << nl << stream << '.' << func << '(' << param << "[ix__]);";
                         out << eb;
                     }
@@ -1190,7 +1199,7 @@ Slice::CsGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                     out << nl << "int " << param << "_lenx = " << stream << ".readAndCheckSeqSize("
                         << static_cast<unsigned>(builtin->minWireSize()) << ");";
                     out << nl << param << " = new ";
-                    if(builtin->kind() == Builtin::KindObject)
+                    if((builtin->kind() == Builtin::KindObject || builtin->kind() == Builtin::KindValue))
                     {
                         if(isArray)
                         {
@@ -1953,6 +1962,7 @@ Slice::CsGenerator::writeOptionalSequenceMarshalUnmarshalCode(Output& out,
             break;
         }
 
+        case Builtin::KindValue:
         case Builtin::KindObject:
         case Builtin::KindObjectProxy:
         {
@@ -2200,6 +2210,7 @@ Slice::CsGenerator::writeSerializeDeserializeCode(Output &out,
                 }
                 break;
             }
+            case Builtin::KindValue:
             case Builtin::KindObject:
             case Builtin::KindLocalObject:
             {
@@ -2530,7 +2541,8 @@ Slice::CsGenerator::MetaDataVisitor::validate(const ContainedPtr& cont)
                         {
                             ClassDeclPtr cd = ClassDeclPtr::dynamicCast(seq->type());
                             BuiltinPtr builtin = BuiltinPtr::dynamicCast(seq->type());
-                            if(!cd && !(builtin && builtin->kind() == Builtin::KindObject))
+                            if(!cd && !(builtin && (builtin->kind() == Builtin::KindObject ||
+                                                    builtin->kind() == Builtin::KindValue)))
                             {
                                 continue;
                             }
diff --git a/cpp/src/Slice/Grammar.cpp b/cpp/src/Slice/Grammar.cpp
index 6e998481aae..6dbff21edc6 100644
--- a/cpp/src/Slice/Grammar.cpp
+++ b/cpp/src/Slice/Grammar.cpp
@@ -1,21 +1,19 @@
+/* A Bison parser, made by GNU Bison 3.0.2.  */
 
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* Bison implementation for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
 
-/* Skeleton implementation for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-   
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -28,7 +26,7 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
@@ -46,7 +44,7 @@
 #define YYBISON 1
 
 /* Bison version.  */
-#define YYBISON_VERSION "2.4.1"
+#define YYBISON_VERSION "3.0.2"
 
 /* Skeleton name.  */
 #define YYSKELETON_NAME "yacc.c"
@@ -60,23 +58,17 @@
 /* Pull parsers.  */
 #define YYPULL 1
 
-/* Using locations.  */
-#define YYLSP_NEEDED 0
 
 /* Substitute the variable and function names.  */
 #define yyparse         slice_parse
 #define yylex           slice_lex
 #define yyerror         slice_error
-#define yylval          slice_lval
-#define yychar          slice_char
 #define yydebug         slice_debug
 #define yynerrs         slice_nerrs
 
 
 /* Copy the first part of user declarations.  */
-
-/* Line 189 of yacc.c  */
-#line 1 "../Slice/Grammar.y"
+#line 1 "../Slice/Grammar.y" /* yacc.c:339  */
 
 
 // **********************************************************************
@@ -119,23 +111,24 @@ slice_error(const char* s)
 
     if (strcmp(s, "parse error") == 0)
     {
-	unit->error("syntax error");
+        unit->error("syntax error");
     }
     else
     {
-	unit->error(s);
+        unit->error(s);
     }
 }
 
 
+#line 124 "Grammar.tab.c" /* yacc.c:339  */
 
-/* Line 189 of yacc.c  */
-#line 134 "Grammar.tab.c"
-
-/* Enabling traces.  */
-#ifndef YYDEBUG
-# define YYDEBUG 1
-#endif
+# ifndef YY_NULLPTR
+#  if defined __cplusplus && 201103L <= __cplusplus
+#   define YY_NULLPTR nullptr
+#  else
+#   define YY_NULLPTR 0
+#  endif
+# endif
 
 /* Enabling verbose error messages.  */
 #ifdef YYERROR_VERBOSE
@@ -145,78 +138,85 @@ slice_error(const char* s)
 # define YYERROR_VERBOSE 0
 #endif
 
-/* Enabling the token table.  */
-#ifndef YYTOKEN_TABLE
-# define YYTOKEN_TABLE 0
+/* In a future release of Bison, this section will be replaced
+   by #include "Grammar.tab.h".  */
+#ifndef YY_SLICE_GRAMMAR_TAB_H_INCLUDED
+# define YY_SLICE_GRAMMAR_TAB_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int slice_debug;
 #endif
 
-
-/* Tokens.  */
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     ICE_MODULE = 258,
-     ICE_CLASS = 259,
-     ICE_INTERFACE = 260,
-     ICE_EXCEPTION = 261,
-     ICE_STRUCT = 262,
-     ICE_SEQUENCE = 263,
-     ICE_DICTIONARY = 264,
-     ICE_ENUM = 265,
-     ICE_OUT = 266,
-     ICE_EXTENDS = 267,
-     ICE_IMPLEMENTS = 268,
-     ICE_THROWS = 269,
-     ICE_VOID = 270,
-     ICE_BYTE = 271,
-     ICE_BOOL = 272,
-     ICE_SHORT = 273,
-     ICE_INT = 274,
-     ICE_LONG = 275,
-     ICE_FLOAT = 276,
-     ICE_DOUBLE = 277,
-     ICE_STRING = 278,
-     ICE_OBJECT = 279,
-     ICE_LOCAL_OBJECT = 280,
-     ICE_LOCAL = 281,
-     ICE_CONST = 282,
-     ICE_FALSE = 283,
-     ICE_TRUE = 284,
-     ICE_IDEMPOTENT = 285,
-     ICE_OPTIONAL = 286,
-     ICE_SCOPE_DELIMITER = 287,
-     ICE_IDENTIFIER = 288,
-     ICE_STRING_LITERAL = 289,
-     ICE_INTEGER_LITERAL = 290,
-     ICE_FLOATING_POINT_LITERAL = 291,
-     ICE_IDENT_OP = 292,
-     ICE_KEYWORD_OP = 293,
-     ICE_OPTIONAL_OP = 294,
-     ICE_METADATA_OPEN = 295,
-     ICE_METADATA_CLOSE = 296,
-     ICE_GLOBAL_METADATA_OPEN = 297,
-     ICE_GLOBAL_METADATA_CLOSE = 298,
-     BAD_CHAR = 299
-   };
+  enum yytokentype
+  {
+    ICE_MODULE = 258,
+    ICE_CLASS = 259,
+    ICE_INTERFACE = 260,
+    ICE_EXCEPTION = 261,
+    ICE_STRUCT = 262,
+    ICE_SEQUENCE = 263,
+    ICE_DICTIONARY = 264,
+    ICE_ENUM = 265,
+    ICE_OUT = 266,
+    ICE_EXTENDS = 267,
+    ICE_IMPLEMENTS = 268,
+    ICE_THROWS = 269,
+    ICE_VOID = 270,
+    ICE_BYTE = 271,
+    ICE_BOOL = 272,
+    ICE_SHORT = 273,
+    ICE_INT = 274,
+    ICE_LONG = 275,
+    ICE_FLOAT = 276,
+    ICE_DOUBLE = 277,
+    ICE_STRING = 278,
+    ICE_OBJECT = 279,
+    ICE_LOCAL_OBJECT = 280,
+    ICE_LOCAL = 281,
+    ICE_CONST = 282,
+    ICE_FALSE = 283,
+    ICE_TRUE = 284,
+    ICE_IDEMPOTENT = 285,
+    ICE_OPTIONAL = 286,
+    ICE_VALUE = 287,
+    ICE_SCOPE_DELIMITER = 288,
+    ICE_IDENTIFIER = 289,
+    ICE_STRING_LITERAL = 290,
+    ICE_INTEGER_LITERAL = 291,
+    ICE_FLOATING_POINT_LITERAL = 292,
+    ICE_IDENT_OP = 293,
+    ICE_KEYWORD_OP = 294,
+    ICE_OPTIONAL_OP = 295,
+    ICE_METADATA_OPEN = 296,
+    ICE_METADATA_CLOSE = 297,
+    ICE_GLOBAL_METADATA_OPEN = 298,
+    ICE_GLOBAL_METADATA_CLOSE = 299,
+    BAD_CHAR = 300
+  };
 #endif
 
-
-
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
-/* Copy the second part of user declarations.  */
 
+int slice_parse (void);
 
-/* Line 264 of yacc.c  */
-#line 220 "Grammar.tab.c"
+#endif /* !YY_SLICE_GRAMMAR_TAB_H_INCLUDED  */
+
+/* Copy the second part of user declarations.  */
+
+#line 220 "Grammar.tab.c" /* yacc.c:358  */
 
 #ifdef short
 # undef short
@@ -230,11 +230,8 @@ typedef unsigned char yytype_uint8;
 
 #ifdef YYTYPE_INT8
 typedef YYTYPE_INT8 yytype_int8;
-#elif (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-typedef signed char yytype_int8;
 #else
-typedef short int yytype_int8;
+typedef signed char yytype_int8;
 #endif
 
 #ifdef YYTYPE_UINT16
@@ -254,8 +251,7 @@ typedef short int yytype_int16;
 #  define YYSIZE_T __SIZE_TYPE__
 # elif defined size_t
 #  define YYSIZE_T size_t
-# elif ! defined YYSIZE_T && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+# elif ! defined YYSIZE_T
 #  include <stddef.h> /* INFRINGES ON USER NAME SPACE */
 #  define YYSIZE_T size_t
 # else
@@ -266,42 +262,71 @@ typedef short int yytype_int16;
 #define YYSIZE_MAXIMUM ((YYSIZE_T) -1)
 
 #ifndef YY_
-# if YYENABLE_NLS
+# if defined YYENABLE_NLS && YYENABLE_NLS
 #  if ENABLE_NLS
 #   include <libintl.h> /* INFRINGES ON USER NAME SPACE */
-#   define YY_(msgid) dgettext ("bison-runtime", msgid)
+#   define YY_(Msgid) dgettext ("bison-runtime", Msgid)
 #  endif
 # endif
 # ifndef YY_
-#  define YY_(msgid) msgid
+#  define YY_(Msgid) Msgid
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE
+# if (defined __GNUC__                                               \
+      && (2 < __GNUC__ || (__GNUC__ == 2 && 96 <= __GNUC_MINOR__)))  \
+     || defined __SUNPRO_C && 0x5110 <= __SUNPRO_C
+#  define YY_ATTRIBUTE(Spec) __attribute__(Spec)
+# else
+#  define YY_ATTRIBUTE(Spec) /* empty */
+# endif
+#endif
+
+#ifndef YY_ATTRIBUTE_PURE
+# define YY_ATTRIBUTE_PURE   YY_ATTRIBUTE ((__pure__))
+#endif
+
+#ifndef YY_ATTRIBUTE_UNUSED
+# define YY_ATTRIBUTE_UNUSED YY_ATTRIBUTE ((__unused__))
+#endif
+
+#if !defined _Noreturn \
+     && (!defined __STDC_VERSION__ || __STDC_VERSION__ < 201112)
+# if defined _MSC_VER && 1200 <= _MSC_VER
+#  define _Noreturn __declspec (noreturn)
+# else
+#  define _Noreturn YY_ATTRIBUTE ((__noreturn__))
 # endif
 #endif
 
 /* Suppress unused-variable warnings by "using" E.  */
 #if ! defined lint || defined __GNUC__
-# define YYUSE(e) ((void) (e))
+# define YYUSE(E) ((void) (E))
 #else
-# define YYUSE(e) /* empty */
+# define YYUSE(E) /* empty */
 #endif
 
-/* Identity function, used to suppress warnings about constant conditions.  */
-#ifndef lint
-# define YYID(n) (n)
+#if defined __GNUC__ && 407 <= __GNUC__ * 100 + __GNUC_MINOR__
+/* Suppress an incorrect diagnostic about yylval being uninitialized.  */
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN \
+    _Pragma ("GCC diagnostic push") \
+    _Pragma ("GCC diagnostic ignored \"-Wuninitialized\"")\
+    _Pragma ("GCC diagnostic ignored \"-Wmaybe-uninitialized\"")
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END \
+    _Pragma ("GCC diagnostic pop")
 #else
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-static int
-YYID (int yyi)
-#else
-static int
-YYID (yyi)
-    int yyi;
+# define YY_INITIAL_VALUE(Value) Value
 #endif
-{
-  return yyi;
-}
+#ifndef YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+# define YY_IGNORE_MAYBE_UNINITIALIZED_END
+#endif
+#ifndef YY_INITIAL_VALUE
+# define YY_INITIAL_VALUE(Value) /* Nothing. */
 #endif
 
+
 #if ! defined yyoverflow || YYERROR_VERBOSE
 
 /* The parser invokes alloca or malloc; define the necessary symbols.  */
@@ -319,11 +344,11 @@ YYID (yyi)
 #    define alloca _alloca
 #   else
 #    define YYSTACK_ALLOC alloca
-#    if ! defined _ALLOCA_H && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#    if ! defined _ALLOCA_H && ! defined EXIT_SUCCESS
 #     include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#     ifndef _STDLIB_H
-#      define _STDLIB_H 1
+      /* Use EXIT_SUCCESS as a witness for stdlib.h.  */
+#     ifndef EXIT_SUCCESS
+#      define EXIT_SUCCESS 0
 #     endif
 #    endif
 #   endif
@@ -331,8 +356,8 @@ YYID (yyi)
 # endif
 
 # ifdef YYSTACK_ALLOC
-   /* Pacify GCC's `empty if-body' warning.  */
-#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (YYID (0))
+   /* Pacify GCC's 'empty if-body' warning.  */
+#  define YYSTACK_FREE(Ptr) do { /* empty */; } while (0)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
     /* The OS might guarantee only one guard page at the bottom of the stack,
        and a page size can be as small as 4096 bytes.  So we cannot safely
@@ -346,25 +371,23 @@ YYID (yyi)
 #  ifndef YYSTACK_ALLOC_MAXIMUM
 #   define YYSTACK_ALLOC_MAXIMUM YYSIZE_MAXIMUM
 #  endif
-#  if (defined __cplusplus && ! defined _STDLIB_H \
+#  if (defined __cplusplus && ! defined EXIT_SUCCESS \
        && ! ((defined YYMALLOC || defined malloc) \
-	     && (defined YYFREE || defined free)))
+             && (defined YYFREE || defined free)))
 #   include <stdlib.h> /* INFRINGES ON USER NAME SPACE */
-#   ifndef _STDLIB_H
-#    define _STDLIB_H 1
+#   ifndef EXIT_SUCCESS
+#    define EXIT_SUCCESS 0
 #   endif
 #  endif
 #  ifndef YYMALLOC
 #   define YYMALLOC malloc
-#   if ! defined malloc && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined malloc && ! defined EXIT_SUCCESS
 void *malloc (YYSIZE_T); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
 #  ifndef YYFREE
 #   define YYFREE free
-#   if ! defined free && ! defined _STDLIB_H && (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
+#   if ! defined free && ! defined EXIT_SUCCESS
 void free (void *); /* INFRINGES ON USER NAME SPACE */
 #   endif
 #  endif
@@ -374,7 +397,7 @@ void free (void *); /* INFRINGES ON USER NAME SPACE */
 
 #if (! defined yyoverflow \
      && (! defined __cplusplus \
-	 || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
+         || (defined YYSTYPE_IS_TRIVIAL && YYSTYPE_IS_TRIVIAL)))
 
 /* A type that is properly aligned for any stack member.  */
 union yyalloc
@@ -392,79 +415,85 @@ union yyalloc
      ((N) * (sizeof (yytype_int16) + sizeof (YYSTYPE)) \
       + YYSTACK_GAP_MAXIMUM)
 
-/* Copy COUNT objects from FROM to TO.  The source and destination do
-   not overlap.  */
-# ifndef YYCOPY
-#  if defined __GNUC__ && 1 < __GNUC__
-#   define YYCOPY(To, From, Count) \
-      __builtin_memcpy (To, From, (Count) * sizeof (*(From)))
-#  else
-#   define YYCOPY(To, From, Count)		\
-      do					\
-	{					\
-	  YYSIZE_T yyi;				\
-	  for (yyi = 0; yyi < (Count); yyi++)	\
-	    (To)[yyi] = (From)[yyi];		\
-	}					\
-      while (YYID (0))
-#  endif
-# endif
+# define YYCOPY_NEEDED 1
 
 /* Relocate STACK from its old location to the new one.  The
    local variables YYSIZE and YYSTACKSIZE give the old and new number of
    elements in the stack, and YYPTR gives the new location of the
    stack.  Advance YYPTR to a properly aligned location for the next
    stack.  */
-# define YYSTACK_RELOCATE(Stack_alloc, Stack)				\
-    do									\
-      {									\
-	YYSIZE_T yynewbytes;						\
-	YYCOPY (&yyptr->Stack_alloc, Stack, yysize);			\
-	Stack = &yyptr->Stack_alloc;					\
-	yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
-	yyptr += yynewbytes / sizeof (*yyptr);				\
-      }									\
-    while (YYID (0))
+# define YYSTACK_RELOCATE(Stack_alloc, Stack)                           \
+    do                                                                  \
+      {                                                                 \
+        YYSIZE_T yynewbytes;                                            \
+        YYCOPY (&yyptr->Stack_alloc, Stack, yysize);                    \
+        Stack = &yyptr->Stack_alloc;                                    \
+        yynewbytes = yystacksize * sizeof (*Stack) + YYSTACK_GAP_MAXIMUM; \
+        yyptr += yynewbytes / sizeof (*yyptr);                          \
+      }                                                                 \
+    while (0)
 
 #endif
 
+#if defined YYCOPY_NEEDED && YYCOPY_NEEDED
+/* Copy COUNT objects from SRC to DST.  The source and destination do
+   not overlap.  */
+# ifndef YYCOPY
+#  if defined __GNUC__ && 1 < __GNUC__
+#   define YYCOPY(Dst, Src, Count) \
+      __builtin_memcpy (Dst, Src, (Count) * sizeof (*(Src)))
+#  else
+#   define YYCOPY(Dst, Src, Count)              \
+      do                                        \
+        {                                       \
+          YYSIZE_T yyi;                         \
+          for (yyi = 0; yyi < (Count); yyi++)   \
+            (Dst)[yyi] = (Src)[yyi];            \
+        }                                       \
+      while (0)
+#  endif
+# endif
+#endif /* !YYCOPY_NEEDED */
+
 /* YYFINAL -- State number of the termination state.  */
 #define YYFINAL  13
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   886
+#define YYLAST   920
 
 /* YYNTOKENS -- Number of terminals.  */
-#define YYNTOKENS  54
+#define YYNTOKENS  55
 /* YYNNTS -- Number of nonterminals.  */
 #define YYNNTS  72
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  202
-/* YYNRULES -- Number of states.  */
-#define YYNSTATES  301
+#define YYNRULES  205
+/* YYNSTATES -- Number of states.  */
+#define YYNSTATES  304
 
-/* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[YYX] -- Symbol number corresponding to YYX as returned
+   by yylex, with out-of-bounds checking.  */
 #define YYUNDEFTOK  2
-#define YYMAXUTOK   299
+#define YYMAXUTOK   300
 
-#define YYTRANSLATE(YYX)						\
+#define YYTRANSLATE(YYX)                                                \
   ((unsigned int) (YYX) <= YYMAXUTOK ? yytranslate[YYX] : YYUNDEFTOK)
 
-/* YYTRANSLATE[YYLEX] -- Bison symbol number corresponding to YYLEX.  */
+/* YYTRANSLATE[TOKEN-NUM] -- Symbol number corresponding to TOKEN-NUM
+   as returned by yylex, without out-of-bounds checking.  */
 static const yytype_uint8 yytranslate[] =
 {
        0,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,    48,    53,     2,    50,     2,     2,     2,     2,     2,
-       2,     2,     2,     2,     2,     2,     2,     2,     2,    45,
-      51,    49,    52,     2,     2,     2,     2,     2,     2,     2,
+       2,    49,    54,     2,    51,     2,     2,     2,     2,     2,
+       2,     2,     2,     2,     2,     2,     2,     2,     2,    46,
+      52,    50,    53,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
-       2,     2,     2,    46,     2,    47,     2,     2,     2,     2,
+       2,     2,     2,    47,     2,    48,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
        2,     2,     2,     2,     2,     2,     2,     2,     2,     2,
@@ -481,129 +510,39 @@ static const yytype_uint8 yytranslate[] =
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
       25,    26,    27,    28,    29,    30,    31,    32,    33,    34,
-      35,    36,    37,    38,    39,    40,    41,    42,    43,    44
+      35,    36,    37,    38,    39,    40,    41,    42,    43,    44,
+      45
 };
 
 #if YYDEBUG
-/* YYPRHS[YYN] -- Index of the first RHS symbol of rule number YYN in
-   YYRHS.  */
-static const yytype_uint16 yyprhs[] =
-{
-       0,     0,     3,     5,     9,    13,    14,    15,    19,    20,
-      26,    27,    32,    35,    36,    38,    40,    42,    44,    46,
-      48,    50,    52,    54,    56,    58,    60,    62,    63,    70,
-      73,    76,    79,    80,    88,    91,    92,    97,   101,   104,
-     105,   108,   112,   116,   119,   121,   124,   126,   128,   131,
-     134,   137,   138,   145,   150,   154,   157,   158,   160,   163,
-     166,   171,   176,   178,   181,   182,   191,   194,   195,   198,
-     199,   204,   208,   211,   212,   214,   218,   221,   223,   225,
-     229,   232,   237,   240,   242,   245,   247,   249,   252,   256,
-     259,   263,   264,   270,   271,   277,   279,   281,   284,   287,
-     290,   291,   299,   303,   305,   307,   310,   311,   316,   320,
-     323,   324,   326,   330,   332,   334,   336,   344,   352,   363,
-     374,   377,   380,   381,   388,   394,   398,   400,   402,   406,
-     408,   409,   411,   413,   415,   416,   417,   421,   427,   432,
-     439,   443,   449,   452,   453,   455,   458,   462,   464,   466,
-     468,   470,   472,   474,   476,   478,   480,   483,   485,   487,
-     490,   493,   495,   499,   501,   503,   504,   506,   508,   510,
-     512,   514,   516,   523,   529,   531,   533,   535,   537,   539,
-     541,   543,   545,   547,   549,   551,   553,   555,   557,   559,
-     561,   563,   565,   567,   569,   571,   573,   575,   577,   579,
-     581,   583,   585
-};
-
-/* YYRHS -- A `-1'-separated list of the rules' RHS.  */
-static const yytype_int8 yyrhs[] =
-{
-      55,     0,    -1,    58,    -1,    42,   121,    43,    -1,    40,
-     121,    41,    -1,    -1,    -1,    56,    59,    58,    -1,    -1,
-      57,    62,    60,    45,    58,    -1,    -1,     1,    45,    61,
-      58,    -1,    57,    62,    -1,    -1,    63,    -1,    83,    -1,
-      84,    -1,    98,    -1,    99,    -1,    66,    -1,    67,    -1,
-      76,    -1,    77,    -1,   107,    -1,   108,    -1,   110,    -1,
-     124,    -1,    -1,     3,    33,    64,    46,    58,    47,    -1,
-       6,    33,    -1,     6,   125,    -1,   122,    65,    -1,    -1,
-     122,    65,    69,    68,    46,    70,    47,    -1,    12,   118,
-      -1,    -1,    57,    74,    45,    70,    -1,     1,    45,    70,
-      -1,    57,    74,    -1,    -1,   119,    33,    -1,    39,    35,
-      48,    -1,    39,   118,    48,    -1,    39,    48,    -1,    31,
-      -1,    72,    71,    -1,    71,    -1,    89,    -1,     7,    33,
-      -1,     7,   125,    -1,   122,    75,    -1,    -1,   122,    75,
-      78,    46,    79,    47,    -1,    57,    80,    45,    79,    -1,
-       1,    45,    79,    -1,    57,    80,    -1,    -1,    90,    -1,
-       4,    33,    -1,     4,   125,    -1,     4,    37,    35,    48,
-      -1,     4,    37,   118,    48,    -1,    81,    -1,   122,    81,
-      -1,    -1,   122,    82,    86,    87,    85,    46,    88,    47,
-      -1,    12,   118,    -1,    -1,    13,   101,    -1,    -1,    57,
-      96,    45,    88,    -1,     1,    45,    88,    -1,    57,    96,
-      -1,    -1,    73,    -1,    73,    49,   123,    -1,   119,   125,
-      -1,   119,    -1,    71,    -1,    71,    49,   123,    -1,    72,
-      71,    -1,    72,    71,    49,   123,    -1,   119,   125,    -1,
-     119,    -1,    72,   119,    -1,   119,    -1,    15,    -1,    91,
-      37,    -1,    30,    91,    37,    -1,    91,    38,    -1,    30,
-      91,    38,    -1,    -1,    92,   116,    48,    94,   117,    -1,
-      -1,    92,     1,    48,    95,   117,    -1,    89,    -1,    93,
-      -1,     5,    33,    -1,     5,   125,    -1,   122,    97,    -1,
-      -1,   122,    97,   102,   100,    46,   103,    47,    -1,   118,
-      50,   101,    -1,   118,    -1,    24,    -1,    12,   101,    -1,
-      -1,    57,   104,    45,   103,    -1,     1,    45,   103,    -1,
-      57,   104,    -1,    -1,    93,    -1,   106,    50,   105,    -1,
-     106,    -1,   118,    -1,   125,    -1,   122,     8,    51,    57,
-     119,    52,    33,    -1,   122,     8,    51,    57,   119,    52,
-     125,    -1,   122,     9,    51,    57,   119,    50,    57,   119,
-      52,    33,    -1,   122,     9,    51,    57,   119,    50,    57,
-     119,    52,   125,    -1,    10,    33,    -1,    10,   125,    -1,
-      -1,   122,   109,   111,    46,   112,    47,    -1,   122,    10,
-      46,   112,    47,    -1,   113,    50,   112,    -1,   113,    -1,
-      33,    -1,    33,    49,   114,    -1,   125,    -1,    -1,    35,
-      -1,   118,    -1,    11,    -1,    -1,    -1,   115,    57,    73,
-      -1,   116,    50,   115,    57,    73,    -1,   115,    57,   119,
-     125,    -1,   116,    50,   115,    57,   119,   125,    -1,   115,
-      57,   119,    -1,   116,    50,   115,    57,   119,    -1,    14,
-     105,    -1,    -1,    33,    -1,    32,    33,    -1,   118,    32,
-      33,    -1,    16,    -1,    17,    -1,    18,    -1,    19,    -1,
-      20,    -1,    21,    -1,    22,    -1,    23,    -1,    24,    -1,
-      24,    53,    -1,    25,    -1,   118,    -1,   118,    53,    -1,
-      34,   120,    -1,    34,    -1,   121,    50,   120,    -1,   120,
-      -1,    26,    -1,    -1,    35,    -1,    36,    -1,   118,    -1,
-      34,    -1,    28,    -1,    29,    -1,    27,    57,   119,    33,
-      49,   123,    -1,    27,    57,   119,    49,   123,    -1,     3,
-      -1,     4,    -1,     5,    -1,     6,    -1,     7,    -1,     8,
-      -1,     9,    -1,    10,    -1,    11,    -1,    12,    -1,    13,
-      -1,    14,    -1,    15,    -1,    16,    -1,    17,    -1,    18,
-      -1,    19,    -1,    20,    -1,    21,    -1,    22,    -1,    23,
-      -1,    24,    -1,    25,    -1,    26,    -1,    27,    -1,    28,
-      -1,    29,    -1,    30,    -1,    31,    -1
-};
-
-/* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
+  /* YYRLINE[YYN] -- Source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   114,   114,   122,   131,   136,   145,   144,   154,   153,
-     164,   163,   168,   173,   180,   184,   188,   192,   196,   200,
-     204,   208,   212,   216,   220,   224,   228,   238,   237,   271,
-     275,   286,   297,   296,   323,   332,   340,   349,   352,   357,
-     364,   377,   397,   453,   461,   474,   482,   497,   503,   507,
-     518,   529,   528,   570,   579,   582,   587,   594,   600,   604,
-     615,   640,   705,   717,   731,   730,   770,   805,   813,   818,
-     826,   835,   838,   843,   850,   872,   899,   921,   947,   956,
-     967,   976,   985,   995,  1009,  1015,  1023,  1035,  1059,  1084,
-    1108,  1139,  1138,  1161,  1160,  1183,  1184,  1190,  1194,  1205,
-    1220,  1219,  1254,  1289,  1324,  1334,  1339,  1347,  1356,  1359,
-    1364,  1371,  1377,  1384,  1396,  1408,  1419,  1428,  1443,  1454,
-    1471,  1475,  1487,  1486,  1510,  1525,  1531,  1539,  1551,  1574,
-    1582,  1591,  1595,  1634,  1641,  1652,  1654,  1670,  1686,  1698,
-    1710,  1721,  1737,  1742,  1750,  1753,  1759,  1772,  1776,  1780,
-    1784,  1788,  1792,  1796,  1800,  1804,  1808,  1812,  1816,  1835,
-    1876,  1882,  1890,  1897,  1909,  1916,  1926,  1939,  1952,  1998,
-    2009,  2020,  2036,  2045,  2059,  2062,  2065,  2068,  2071,  2074,
-    2077,  2080,  2083,  2086,  2089,  2092,  2095,  2098,  2101,  2104,
-    2107,  2110,  2113,  2116,  2119,  2122,  2125,  2128,  2131,  2134,
-    2137,  2140,  2143
+       0,   115,   115,   123,   132,   137,   146,   145,   155,   154,
+     165,   164,   169,   174,   181,   185,   189,   193,   197,   201,
+     205,   209,   213,   217,   221,   225,   229,   239,   238,   272,
+     276,   287,   298,   297,   324,   333,   341,   350,   353,   358,
+     365,   378,   398,   454,   462,   475,   483,   498,   504,   508,
+     519,   530,   529,   571,   580,   583,   588,   595,   601,   605,
+     616,   641,   706,   718,   732,   731,   771,   806,   814,   819,
+     827,   836,   839,   844,   851,   873,   900,   922,   948,   957,
+     968,   977,   986,   996,  1010,  1016,  1024,  1036,  1060,  1085,
+    1109,  1140,  1139,  1162,  1161,  1184,  1185,  1191,  1195,  1206,
+    1221,  1220,  1255,  1290,  1325,  1330,  1340,  1345,  1353,  1362,
+    1365,  1370,  1377,  1383,  1390,  1402,  1414,  1425,  1434,  1449,
+    1460,  1477,  1481,  1493,  1492,  1516,  1531,  1537,  1545,  1557,
+    1580,  1588,  1597,  1601,  1640,  1647,  1658,  1660,  1676,  1692,
+    1704,  1716,  1727,  1743,  1748,  1756,  1759,  1765,  1778,  1782,
+    1786,  1790,  1794,  1798,  1802,  1806,  1810,  1814,  1818,  1822,
+    1826,  1845,  1886,  1892,  1900,  1907,  1919,  1926,  1936,  1949,
+    1962,  2008,  2019,  2030,  2046,  2055,  2069,  2072,  2075,  2078,
+    2081,  2084,  2087,  2090,  2093,  2096,  2099,  2102,  2105,  2108,
+    2111,  2114,  2117,  2120,  2123,  2126,  2129,  2132,  2135,  2138,
+    2141,  2144,  2147,  2150,  2153,  2156
 };
 #endif
 
-#if YYDEBUG || YYERROR_VERBOSE || YYTOKEN_TABLE
+#if YYDEBUG || YYERROR_VERBOSE || 0
 /* YYTNAME[SYMBOL-NUM] -- String name of the symbol SYMBOL-NUM.
    First, the terminals, then, starting at YYNTOKENS, nonterminals.  */
 static const char *const yytname[] =
@@ -614,7 +553,7 @@ static const char *const yytname[] =
   "ICE_THROWS", "ICE_VOID", "ICE_BYTE", "ICE_BOOL", "ICE_SHORT", "ICE_INT",
   "ICE_LONG", "ICE_FLOAT", "ICE_DOUBLE", "ICE_STRING", "ICE_OBJECT",
   "ICE_LOCAL_OBJECT", "ICE_LOCAL", "ICE_CONST", "ICE_FALSE", "ICE_TRUE",
-  "ICE_IDEMPOTENT", "ICE_OPTIONAL", "ICE_SCOPE_DELIMITER",
+  "ICE_IDEMPOTENT", "ICE_OPTIONAL", "ICE_VALUE", "ICE_SCOPE_DELIMITER",
   "ICE_IDENTIFIER", "ICE_STRING_LITERAL", "ICE_INTEGER_LITERAL",
   "ICE_FLOATING_POINT_LITERAL", "ICE_IDENT_OP", "ICE_KEYWORD_OP",
   "ICE_OPTIONAL_OP", "ICE_METADATA_OPEN", "ICE_METADATA_CLOSE",
@@ -635,495 +574,456 @@ static const char *const yytname[] =
   "dictionary_def", "enum_id", "enum_def", "@11", "enumerator_list",
   "enumerator", "enumerator_initializer", "out_qualifier", "parameters",
   "throws", "scoped_name", "type", "string_literal", "string_list",
-  "local_qualifier", "const_initializer", "const_def", "keyword", 0
+  "local_qualifier", "const_initializer", "const_def", "keyword", YY_NULLPTR
 };
 #endif
 
 # ifdef YYPRINT
-/* YYTOKNUM[YYLEX-NUM] -- Internal token number corresponding to
-   token YYLEX-NUM.  */
+/* YYTOKNUM[NUM] -- (External) token number corresponding to the
+   (internal) symbol number NUM (which must be that of a token).  */
 static const yytype_uint16 yytoknum[] =
 {
        0,   256,   257,   258,   259,   260,   261,   262,   263,   264,
      265,   266,   267,   268,   269,   270,   271,   272,   273,   274,
      275,   276,   277,   278,   279,   280,   281,   282,   283,   284,
      285,   286,   287,   288,   289,   290,   291,   292,   293,   294,
-     295,   296,   297,   298,   299,    59,   123,   125,    41,    61,
-      44,    60,    62,    42
+     295,   296,   297,   298,   299,   300,    59,   123,   125,    41,
+      61,    44,    60,    62,    42
 };
 # endif
 
-/* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
-static const yytype_uint8 yyr1[] =
-{
-       0,    54,    55,    56,    57,    57,    59,    58,    60,    58,
-      61,    58,    58,    58,    62,    62,    62,    62,    62,    62,
-      62,    62,    62,    62,    62,    62,    62,    64,    63,    65,
-      65,    66,    68,    67,    69,    69,    70,    70,    70,    70,
-      71,    72,    72,    72,    72,    73,    73,    74,    75,    75,
-      76,    78,    77,    79,    79,    79,    79,    80,    81,    81,
-      82,    82,    82,    83,    85,    84,    86,    86,    87,    87,
-      88,    88,    88,    88,    89,    89,    89,    89,    90,    90,
-      90,    90,    90,    90,    91,    91,    91,    92,    92,    92,
-      92,    94,    93,    95,    93,    96,    96,    97,    97,    98,
-     100,    99,   101,   101,   101,   102,   102,   103,   103,   103,
-     103,   104,   105,   105,   106,   106,   107,   107,   108,   108,
-     109,   109,   111,   110,   110,   112,   112,   113,   113,   113,
-     113,   114,   114,   115,   115,   116,   116,   116,   116,   116,
-     116,   116,   117,   117,   118,   118,   118,   119,   119,   119,
-     119,   119,   119,   119,   119,   119,   119,   119,   119,   119,
-     120,   120,   121,   121,   122,   122,   123,   123,   123,   123,
-     123,   123,   124,   124,   125,   125,   125,   125,   125,   125,
-     125,   125,   125,   125,   125,   125,   125,   125,   125,   125,
-     125,   125,   125,   125,   125,   125,   125,   125,   125,   125,
-     125,   125,   125
-};
+#define YYPACT_NINF -221
 
-/* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
-static const yytype_uint8 yyr2[] =
+#define yypact_value_is_default(Yystate) \
+  (!!((Yystate) == (-221)))
+
+#define YYTABLE_NINF -137
+
+#define yytable_value_is_error(Yytable_value) \
+  0
+
+  /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
+     STATE-NUM.  */
+static const yytype_int16 yypact[] =
 {
-       0,     2,     1,     3,     3,     0,     0,     3,     0,     5,
-       0,     4,     2,     0,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     0,     6,     2,
-       2,     2,     0,     7,     2,     0,     4,     3,     2,     0,
-       2,     3,     3,     2,     1,     2,     1,     1,     2,     2,
-       2,     0,     6,     4,     3,     2,     0,     1,     2,     2,
-       4,     4,     1,     2,     0,     8,     2,     0,     2,     0,
-       4,     3,     2,     0,     1,     3,     2,     1,     1,     3,
-       2,     4,     2,     1,     2,     1,     1,     2,     3,     2,
-       3,     0,     5,     0,     5,     1,     1,     2,     2,     2,
-       0,     7,     3,     1,     1,     2,     0,     4,     3,     2,
-       0,     1,     3,     1,     1,     1,     7,     7,    10,    10,
-       2,     2,     0,     6,     5,     3,     1,     1,     3,     1,
-       0,     1,     1,     1,     0,     0,     3,     5,     4,     6,
-       3,     5,     2,     0,     1,     2,     3,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     2,     1,     1,     2,
-       2,     1,     3,     1,     1,     0,     1,     1,     1,     1,
-       1,     1,     6,     5,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
-       1,     1,     1
+     523,   -16,     2,     2,    34,  -221,    19,  -221,  -221,     2,
+    -221,    24,   -15,  -221,   115,    43,  -221,    40,    39,  -221,
+    -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,
+    -221,   124,  -221,   115,  -221,  -221,     2,  -221,  -221,  -221,
+     221,    65,   601,   669,   701,   733,    60,    61,   488,     3,
+      79,     9,   123,     4,  -221,  -221,  -221,    89,  -221,  -221,
+    -221,  -221,  -221,  -221,  -221,  -221,    83,  -221,  -221,   104,
+    -221,     6,   -10,   115,  -221,  -221,  -221,  -221,  -221,  -221,
+    -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,
+    -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,  -221,
+    -221,  -221,  -221,  -221,  -221,    -1,  -221,  -221,  -221,  -221,
+    -221,  -221,  -221,    40,    40,  -221,   765,  -221,    46,  -221,
+      93,    46,   130,    59,  -221,   100,   442,  -221,  -221,   114,
+    -221,    99,    66,  -221,   101,    10,   221,   221,   102,   103,
+     106,  -221,   120,   108,   362,   120,    59,  -221,  -221,  -221,
+    -221,    -7,   112,   765,   116,  -221,    66,  -221,  -221,  -221,
+    -221,  -221,   120,  -221,  -221,  -221,   117,   118,    54,  -221,
+     765,   396,   119,   880,   125,  -221,   121,    59,   294,   127,
+    -221,  -221,   797,    40,  -221,  -221,   120,  -221,   126,   880,
+     131,   362,  -221,    35,   128,   221,   134,  -221,   829,  -221,
+     328,  -221,   136,   440,   137,  -221,  -221,  -221,   221,   396,
+    -221,   221,   138,   141,  -221,   829,  -221,  -221,   122,  -221,
+      29,    66,   139,   133,   362,  -221,  -221,   144,   440,   143,
+     294,  -221,   521,   221,    67,   257,  -221,   147,  -221,  -221,
+     142,  -221,  -221,    66,   396,  -221,  -221,  -221,  -221,    66,
+    -221,   328,   221,  -221,  -221,   148,   564,  -221,  -221,    69,
+    -221,  -221,  -221,   135,  -221,    40,    23,   294,   861,  -221,
+    -221,  -221,  -221,   133,   328,  -221,  -221,  -221,   880,  -221,
+     185,  -221,  -221,  -221,  -221,   184,  -221,   829,   184,    40,
+     637,  -221,  -221,  -221,   880,  -221,   149,   120,  -221,  -221,
+     829,   637,  -221,  -221
 };
 
-/* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
-   STATE-NUM when YYTABLE doesn't specify something else to do.  Zero
-   means the default is an error.  */
+  /* YYDEFACT[STATE-NUM] -- Default reduction number in state STATE-NUM.
+     Performed when YYTABLE does not specify something else to do.  Zero
+     means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       0,     0,     0,     0,     0,     6,   165,     2,    10,   161,
-     163,     0,     0,     1,     0,     0,   164,     5,    12,    14,
+       0,     0,     0,     0,     0,     6,   167,     2,    10,   163,
+     165,     0,     0,     1,     0,     0,   166,     5,    12,    14,
       19,    20,    21,    22,    15,    16,    17,    18,    23,    24,
-      25,     0,    26,     0,   160,     4,     0,     3,     7,    27,
+      25,     0,    26,     0,   162,     4,     0,     3,     7,    27,
        0,     0,     0,     0,     0,     0,     0,     0,     0,    31,
-      50,    62,    67,    99,   122,    11,   162,     0,   147,   148,
-     149,   150,   151,   152,   153,   154,   155,   157,     0,   144,
-     158,     0,     0,   174,   175,   176,   177,   178,   179,   180,
-     181,   182,   183,   184,   185,   186,   187,   188,   189,   190,
-     191,   192,   193,   194,   195,   196,   197,   198,   199,   200,
-     201,   202,    58,     0,    59,    97,    98,    29,    30,    48,
-      49,     5,     5,   120,   130,   121,     0,    32,     0,     0,
-      69,     0,   100,     0,     0,   156,   145,     0,   159,     0,
-       0,     9,     0,     0,     0,     0,   127,     0,   126,   129,
-      34,     0,     0,    66,     0,    64,   104,   105,   103,     0,
-     130,     0,   146,     0,   170,   171,   169,   166,   167,   168,
-     173,    60,    61,     0,     0,     0,   124,   130,     0,     0,
-       0,     0,    68,     0,     0,     0,     0,    28,   172,     0,
-       5,   131,   128,   132,   125,     0,     0,     0,     0,    44,
-       0,    78,     0,    55,    57,    83,    52,     0,   102,     0,
-       0,     0,   123,   116,   117,     0,     0,    46,     0,    74,
-      38,    47,    77,    33,    54,     0,    43,     0,     0,    80,
-       0,     0,    40,    82,     0,     0,     0,     0,    86,     0,
-       0,     0,     0,   111,   109,    85,   101,     0,    37,    45,
-       0,     0,    76,    41,    42,    79,     0,    53,     0,     0,
-      95,    96,    72,    77,    65,   108,     0,    84,    87,    89,
-       0,   133,     5,     0,     0,     0,    75,    36,    81,    71,
-      84,     0,    88,    90,    93,     0,    91,   134,   107,   118,
-     119,    70,   143,   136,   140,   143,     5,     0,    94,   138,
-      92,     0,   142,   113,   114,   115,   137,   141,     0,   139,
-     112
-};
-
-/* YYDEFGOTO[NTERM-NUM].  */
-static const yytype_int16 yydefgoto[] =
-{
-      -1,     4,     5,     6,     7,    14,    41,    33,    18,    19,
-      57,    49,    20,    21,   141,   117,   187,   207,   208,   209,
-     210,    50,    22,    23,   118,   171,   193,    51,    52,    24,
-      25,   173,   120,   145,   226,   211,   194,   231,   232,   233,
-     285,   282,   252,    53,    26,    27,   149,   147,   122,   201,
-     234,   292,   293,    28,    29,    54,    30,   123,   137,   138,
-     182,   262,   263,   288,    70,   220,    10,    11,    31,   160,
-      32,   139
+      50,    62,    67,    99,   123,    11,   164,     0,   148,   149,
+     150,   151,   152,   153,   154,   155,   156,   158,   159,     0,
+     145,   160,     0,     0,   176,   177,   178,   179,   180,   181,
+     182,   183,   184,   185,   186,   187,   188,   189,   190,   191,
+     192,   193,   194,   195,   196,   197,   198,   199,   200,   201,
+     202,   203,   204,   205,    58,     0,    59,    97,    98,    29,
+      30,    48,    49,     5,     5,   121,   131,   122,     0,    32,
+       0,     0,    69,     0,   100,     0,     0,   157,   146,     0,
+     161,     0,     0,     9,     0,     0,     0,     0,   128,     0,
+     127,   130,    34,     0,     0,    66,     0,    64,   104,   105,
+     106,   103,     0,   131,     0,   147,     0,   172,   173,   171,
+     168,   169,   170,   175,    60,    61,     0,     0,     0,   125,
+     131,     0,     0,     0,     0,    68,     0,     0,     0,     0,
+      28,   174,     0,     5,   132,   129,   133,   126,     0,     0,
+       0,     0,    44,     0,    78,     0,    55,    57,    83,    52,
+       0,   102,     0,     0,     0,   124,   117,   118,     0,     0,
+      46,     0,    74,    38,    47,    77,    33,    54,     0,    43,
+       0,     0,    80,     0,     0,    40,    82,     0,     0,     0,
+       0,    86,     0,     0,     0,     0,   112,   110,    85,   101,
+       0,    37,    45,     0,     0,    76,    41,    42,    79,     0,
+      53,     0,     0,    95,    96,    72,    77,    65,   109,     0,
+      84,    87,    89,     0,   134,     5,     0,     0,     0,    75,
+      36,    81,    71,    84,     0,    88,    90,    93,     0,    91,
+     135,   108,   119,   120,    70,   144,   137,   141,   144,     5,
+       0,    94,   139,    92,     0,   143,   114,   115,   116,   138,
+     142,     0,   140,   113
 };
 
-/* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
-   STATE-NUM.  */
-#define YYPACT_NINF -227
-static const yytype_int16 yypact[] =
+  /* YYPGOTO[NTERM-NUM].  */
+static const yytype_int16 yypgoto[] =
 {
-     126,   -16,     4,     4,    65,  -227,    21,  -227,  -227,     4,
-    -227,   -10,   -11,  -227,    73,    38,  -227,    46,    58,  -227,
-    -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,
-    -227,   291,  -227,    73,  -227,  -227,     4,  -227,  -227,  -227,
-     853,    61,   559,   625,   656,   687,    59,    63,   479,     6,
-      77,     9,    99,    11,  -227,  -227,  -227,    82,  -227,  -227,
-    -227,  -227,  -227,  -227,  -227,  -227,    84,  -227,   106,  -227,
-       5,    26,    73,  -227,  -227,  -227,  -227,  -227,  -227,  -227,
-    -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,
-    -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,  -227,
-    -227,  -227,  -227,    29,  -227,  -227,  -227,  -227,  -227,  -227,
-    -227,    46,    46,  -227,   718,  -227,     1,  -227,    94,     1,
-     129,     3,  -227,   100,   434,  -227,  -227,   112,  -227,    98,
-     158,  -227,   101,    37,   853,   853,   105,   103,   110,  -227,
-     116,   109,   356,   116,     3,  -227,  -227,  -227,    -6,   115,
-     718,   117,  -227,   158,  -227,  -227,  -227,  -227,  -227,   116,
-    -227,  -227,  -227,   104,   119,    86,  -227,   718,   389,   120,
-     829,   123,  -227,   121,     3,   290,   125,  -227,  -227,   749,
-      46,  -227,  -227,   116,  -227,   130,   829,   132,   356,  -227,
-      69,   113,   853,   131,  -227,   780,  -227,   323,  -227,   136,
-     432,   135,  -227,  -227,  -227,   853,   389,  -227,   853,   128,
-     138,  -227,   780,  -227,  -227,   140,  -227,    57,   158,   146,
-     151,   356,  -227,  -227,   152,   432,   153,   290,  -227,   219,
-     853,    54,   254,  -227,   154,  -227,  -227,   149,  -227,  -227,
-     158,   389,  -227,  -227,  -227,  -227,   158,  -227,   323,   853,
-    -227,  -227,   160,   523,  -227,  -227,    60,  -227,  -227,  -227,
-     159,  -227,    46,    74,   290,   811,  -227,  -227,  -227,  -227,
-     151,   323,  -227,  -227,  -227,   829,  -227,   195,  -227,  -227,
-    -227,  -227,   194,  -227,   780,   194,    46,   594,  -227,  -227,
-    -227,   829,  -227,   161,   116,  -227,  -227,   780,   594,  -227,
-    -227
+    -221,  -221,  -221,   -17,   -12,  -221,  -221,  -221,  -221,  -221,
+    -221,  -221,  -221,  -221,  -221,  -221,  -191,  -170,  -165,  -208,
+    -221,  -221,  -221,  -221,  -221,  -168,  -221,  -221,  -221,  -221,
+    -221,  -221,  -221,  -221,  -220,   -29,  -221,   -30,  -221,   -25,
+    -221,  -221,  -221,  -221,  -221,  -221,  -221,  -119,  -221,  -218,
+    -221,   -97,  -221,  -221,  -221,  -221,  -221,  -221,  -105,  -221,
+    -221,   -72,  -221,   -79,  -104,   -27,    11,   207,  -221,  -145,
+    -221,   -38
 };
 
-/* YYPGOTO[NTERM-NUM].  */
-static const yytype_int16 yypgoto[] =
+  /* YYDEFGOTO[NTERM-NUM].  */
+static const yytype_int16 yydefgoto[] =
 {
-    -227,  -227,  -227,   -17,   -12,  -227,  -227,  -227,  -227,  -227,
-    -227,  -227,  -227,  -227,  -227,  -227,  -191,  -162,  -159,  -182,
-    -227,  -227,  -227,  -227,  -227,  -168,  -227,  -227,  -227,  -227,
-    -227,  -227,  -227,  -227,  -226,   -13,  -227,   -20,  -227,    -9,
-    -227,  -227,  -227,  -227,  -227,  -227,  -227,  -119,  -227,  -215,
-    -227,   -85,  -227,  -227,  -227,  -227,  -227,  -227,   -83,  -227,
-    -227,   -63,  -227,   -68,  -102,   -27,     7,   215,  -227,  -150,
-    -227,   -38
+      -1,     4,     5,     6,     7,    14,    41,    33,    18,    19,
+      57,    49,    20,    21,   143,   119,   190,   210,   211,   212,
+     213,    50,    22,    23,   120,   174,   196,    51,    52,    24,
+      25,   176,   122,   147,   229,   214,   197,   234,   235,   236,
+     288,   285,   255,    53,    26,    27,   152,   150,   124,   204,
+     237,   295,   296,    28,    29,    54,    30,   125,   139,   140,
+     185,   265,   266,   291,    71,   223,    10,    11,    31,   163,
+      32,   141
 };
 
-/* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
-   positive, shift that token.  If negative, reduce the rule which
-   number is the opposite.  If zero, do what YYDEFACT says.
-   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -136
+  /* YYTABLE[YYPACT[STATE-NUM]] -- What to do in state STATE-NUM.  If
+     positive, shift that token.  If negative, reduce the rule whose
+     number is the opposite.  If YYTABLE_NINF, syntax error.  */
 static const yytype_int16 yytable[] =
 {
-      40,   133,    38,   178,   104,   106,   108,   110,   191,   -63,
-     115,   192,   255,    71,   140,   238,    34,   143,   116,   148,
-     214,    55,   269,   121,    15,   172,   127,   146,   159,     8,
-     219,    35,    37,    68,    69,    68,    69,   127,     9,    36,
-      36,   230,   148,    56,   174,   281,   239,    16,    17,   278,
-     267,   159,   -35,   247,   -63,   198,   -63,  -106,   128,   129,
-     131,    68,    69,   183,   132,    13,   249,   176,   245,   127,
-     230,    39,   148,   -13,     1,   130,    -5,    -5,    -5,    -5,
-      -5,    -5,    -5,    -5,   184,   162,     2,   239,   217,   127,
-     266,   258,   259,   283,   134,   135,   268,   272,   273,    -5,
-      -5,    68,    69,    -8,   215,   244,    72,   163,   164,   296,
-     111,   119,   151,     2,   112,     3,   159,   216,    68,    69,
-     -13,   181,   276,   -51,   277,   170,   -13,     1,   124,    -5,
-      -5,    -5,    -5,    -5,    -5,    -5,    -5,   125,   159,   126,
-     142,   204,   144,   195,   159,   152,   150,   153,   127,   161,
-     166,   186,    -5,    -5,   165,   168,   179,   223,   200,   212,
-     167,   175,   218,   205,   177,   188,     2,   197,     3,   180,
-     196,   170,   202,   235,   242,   206,   221,   240,   237,   213,
-     225,   227,   236,   241,   222,   294,   154,   155,   243,   186,
-      68,    69,   156,   157,   158,   246,   294,   248,   253,   264,
-     254,   265,   235,   257,   170,   271,   261,   274,   287,   256,
-     200,   298,   250,   300,   286,   242,   251,   290,    12,     0,
-       0,     0,   270,     0,   186,     0,     0,   280,     0,     0,
-       0,   225,     0,     0,   228,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    67,   275,   289,   200,   284,   295,
-     189,    68,    69,     0,   225,   260,     0,     0,   190,   299,
-     295,     0,     0,     0,   297,   261,     0,     0,     0,   291,
-    -134,  -134,  -134,  -134,  -134,  -134,  -134,  -134,  -134,  -134,
-       0,     0,     0,     0,     0,  -134,  -134,  -134,     0,     0,
-       0,   199,     0,  -134,  -134,    42,    43,    44,    45,    46,
-      47,    48,  -135,     0,  -135,    -5,    -5,    -5,    -5,    -5,
-      -5,    -5,    -5,    -5,    -5,    -5,     0,     0,     0,     0,
-      -5,    -5,    -5,    -5,   224,     0,     0,     0,     0,    -5,
-       2,     0,     0,     0,     0,     0,     0,  -110,    -5,    -5,
-      -5,    -5,    -5,    -5,    -5,    -5,    -5,    -5,    -5,     0,
-       0,     0,     0,    -5,    -5,    -5,    -5,   169,     0,     0,
+      40,   135,    38,   194,   106,   108,   110,   112,   195,   -63,
+     117,   181,   258,    72,   142,   118,   123,   145,   241,   151,
+      34,    55,    15,   217,   131,   222,   129,   175,   162,    37,
+       8,   272,    69,    70,    13,   134,    36,     9,   233,   129,
+     132,   242,   151,   129,   177,    16,    17,    56,   179,   281,
+     -35,  -107,   162,   270,   284,   -63,   250,   -63,   201,   165,
+     130,   133,   129,   252,   186,   187,    35,   233,    69,    70,
+     286,   218,   279,   151,   280,    36,   248,    39,   247,    69,
+      70,     2,   242,   148,   219,    -8,   299,    69,    70,   220,
+     184,   149,    69,    70,   157,   158,   136,   137,   269,    69,
+      70,   159,   160,   161,   271,   261,   262,   275,   276,   166,
+     167,    73,   113,   114,   154,   -13,     1,   162,    -5,    -5,
+      -5,    -5,    -5,    -5,    -5,    -5,   -51,   173,    42,    43,
+      44,    45,    46,    47,    48,   121,   126,   127,   128,   162,
+     144,    -5,    -5,   146,   207,   162,   198,   153,   155,   156,
+     164,   169,   168,   129,   189,   171,     2,   170,     3,   178,
+     226,   203,   215,   -13,   180,   191,   208,   225,   200,   183,
+     182,   246,   209,   199,   173,   205,   238,   245,   221,   216,
+     224,   240,   230,   228,   277,   239,   297,   244,   243,   249,
+     251,   257,   189,   267,   274,   268,   264,   297,   290,   253,
+     301,   256,   259,   254,   303,   238,   260,   173,   289,   293,
+      12,     0,     0,   203,     0,     0,     0,     0,   245,     0,
+       0,     0,     0,     0,     0,   273,     0,   189,     0,     0,
+     283,     0,     0,     0,   228,     0,     0,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,     0,   278,   292,
+     203,   287,   298,    68,    69,    70,     0,   228,   263,     0,
+       0,     0,   302,   298,     0,     0,     0,   300,   264,     0,
+       0,     0,   294,  -135,  -135,  -135,  -135,  -135,  -135,  -135,
+    -135,  -135,  -135,     0,     0,     0,     0,     0,  -135,  -135,
+    -135,  -135,     0,     0,     0,   202,     0,  -135,  -135,     0,
+       0,     0,     0,     0,     0,     0,  -136,     0,  -136,    -5,
+      -5,    -5,    -5,    -5,    -5,    -5,    -5,    -5,    -5,    -5,
+       0,     0,     0,     0,    -5,    -5,    -5,    -5,    -5,   227,
+       0,     0,     0,     0,    -5,     2,     0,     0,     0,     0,
+       0,     0,  -111,    -5,    -5,    -5,    -5,    -5,    -5,    -5,
+      -5,    -5,    -5,    -5,     0,     0,     0,     0,    -5,    -5,
+      -5,    -5,    -5,   172,     0,     0,     0,     0,    -5,     2,
+       0,     0,     0,     0,     0,     0,   -73,     0,    -5,    -5,
+      -5,    -5,    -5,    -5,    -5,    -5,    -5,    -5,     0,     0,
+       0,     0,     0,    -5,    -5,    -5,    -5,   188,     0,     0,
        0,     0,    -5,     2,     0,     0,     0,     0,     0,     0,
-     -73,     0,    -5,    -5,    -5,    -5,    -5,    -5,    -5,    -5,
+     -56,     0,    -5,    -5,    -5,    -5,    -5,    -5,    -5,    -5,
       -5,    -5,     0,     0,     0,     0,     0,    -5,    -5,    -5,
-     185,     0,     0,     0,     0,    -5,     2,     0,     0,     0,
-       0,     0,     0,   -56,     0,    -5,    -5,    -5,    -5,    -5,
-      -5,    -5,    -5,    -5,    -5,     0,     0,     0,     0,     0,
-      -5,    -5,    -5,     0,     0,     0,     0,     0,    -5,     2,
-       0,     0,     0,     0,     0,     1,   -39,    -5,    -5,    -5,
-      -5,    -5,    -5,    -5,    -5,     0,     0,   228,    58,    59,
-      60,    61,    62,    63,    64,    65,    66,    67,     0,     0,
-      -5,    -5,   229,   189,    68,    69,     0,     0,     0,     0,
-       0,   190,     0,     0,     2,     0,     3,     0,     0,     0,
-       0,   -13,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,     0,   113,     0,     0,     0,     0,     0,     0,     0,
-       0,     0,     0,     0,     0,   114,    73,    74,    75,    76,
+      -5,     0,     0,     0,     0,     0,    -5,     2,     0,     0,
+       0,     0,     0,     1,   -39,    -5,    -5,    -5,    -5,    -5,
+      -5,    -5,    -5,     0,     0,   231,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,     0,     0,    -5,    -5,
+     232,   192,    68,    69,    70,     0,     0,     0,     0,     0,
+     193,     0,     0,     2,     0,     3,     0,     0,     0,     0,
+     -13,    74,    75,    76,    77,    78,    79,    80,    81,    82,
+      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
+      93,    94,    95,    96,    97,    98,    99,   100,   101,   102,
+     103,     0,   115,   -13,     1,     0,    -5,    -5,    -5,    -5,
+      -5,    -5,    -5,    -5,     0,   116,   231,    58,    59,    60,
+      61,    62,    63,    64,    65,    66,    67,     0,     0,    -5,
+      -5,     0,   192,    68,    69,    70,     0,     0,     0,     0,
+       0,   193,     0,     0,     2,     0,     3,    74,    75,    76,
       77,    78,    79,    80,    81,    82,    83,    84,    85,    86,
       87,    88,    89,    90,    91,    92,    93,    94,    95,    96,
-      97,    98,    99,   100,   101,     0,   222,     0,     0,     0,
-     -85,   -85,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,     0,   102,     0,     0,     0,   103,    73,    74,    75,
+      97,    98,    99,   100,   101,   102,   103,     0,   225,     0,
+       0,     0,   -85,   -85,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,     0,   104,     0,     0,     0,   105,
+      74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
+      84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+      69,    70,    74,    75,    76,    77,    78,    79,    80,    81,
+      82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
+      92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
+     102,   103,     0,   107,    74,    75,    76,    77,    78,    79,
+      80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
+      90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
+     100,   101,   102,   103,     0,   109,    74,    75,    76,    77,
+      78,    79,    80,    81,    82,    83,    84,    85,    86,    87,
+      88,    89,    90,    91,    92,    93,    94,    95,    96,    97,
+      98,    99,   100,   101,   102,   103,     0,   111,    74,    75,
       76,    77,    78,    79,    80,    81,    82,    83,    84,    85,
       86,    87,    88,    89,    90,    91,    92,    93,    94,    95,
-      96,    97,    98,    99,   100,   101,    68,    69,    73,    74,
-      75,    76,    77,    78,    79,    80,    81,    82,    83,    84,
-      85,    86,    87,    88,    89,    90,    91,    92,    93,    94,
-      95,    96,    97,    98,    99,   100,   101,     0,   105,    73,
+      96,    97,    98,    99,   100,   101,   102,   103,     0,   138,
       74,    75,    76,    77,    78,    79,    80,    81,    82,    83,
       84,    85,    86,    87,    88,    89,    90,    91,    92,    93,
-      94,    95,    96,    97,    98,    99,   100,   101,     0,   107,
-      73,    74,    75,    76,    77,    78,    79,    80,    81,    82,
-      83,    84,    85,    86,    87,    88,    89,    90,    91,    92,
-      93,    94,    95,    96,    97,    98,    99,   100,   101,     0,
-     109,    73,    74,    75,    76,    77,    78,    79,    80,    81,
+      94,    95,    96,    97,    98,    99,   100,   101,   102,   103,
+       0,   206,    74,    75,    76,    77,    78,    79,    80,    81,
       82,    83,    84,    85,    86,    87,    88,    89,    90,    91,
       92,    93,    94,    95,    96,    97,    98,    99,   100,   101,
-       0,   136,    73,    74,    75,    76,    77,    78,    79,    80,
-      81,    82,    83,    84,    85,    86,    87,    88,    89,    90,
-      91,    92,    93,    94,    95,    96,    97,    98,    99,   100,
-     101,     0,   203,    73,    74,    75,    76,    77,    78,    79,
+     102,   103,     0,   225,    74,    75,    76,    77,    78,    79,
       80,    81,    82,    83,    84,    85,    86,    87,    88,    89,
       90,    91,    92,    93,    94,    95,    96,    97,    98,    99,
-     100,   101,     0,   222,    73,    74,    75,    76,    77,    78,
-      79,    80,    81,    82,    83,    84,    85,    86,    87,    88,
-      89,    90,    91,    92,    93,    94,    95,    96,    97,    98,
-      99,   100,   101,     0,   279,    58,    59,    60,    61,    62,
-      63,    64,    65,    66,    67,     0,     0,     0,     0,     0,
-     189,    68,    69,     0,     0,     0,     0,     0,   190,    58,
-      59,    60,    61,    62,    63,    64,    65,    66,    67,     0,
-       0,     0,     0,     0,     0,    68,    69
+     100,   101,   102,   103,     0,   282,    58,    59,    60,    61,
+      62,    63,    64,    65,    66,    67,     0,     0,     0,     0,
+       0,   192,    68,    69,    70,     0,     0,     0,     0,     0,
+     193
 };
 
 static const yytype_int16 yycheck[] =
 {
-      17,   103,    14,   153,    42,    43,    44,    45,   170,     0,
-      48,   170,   227,    40,   116,   206,     9,   119,    12,   121,
-     188,    33,   248,    12,     3,   144,    32,    24,   130,    45,
-     192,    41,    43,    32,    33,    32,    33,    32,    34,    50,
-      50,   200,   144,    36,    50,   271,   208,    26,    27,   264,
-     241,   153,    46,   221,    45,   174,    47,    46,    53,    33,
-      72,    32,    33,   165,    35,     0,   225,   150,   218,    32,
-     229,    33,   174,     0,     1,    49,     3,     4,     5,     6,
-       7,     8,     9,    10,   167,    48,    40,   249,   190,    32,
-     240,    37,    38,   275,   111,   112,   246,    37,    38,    26,
-      27,    32,    33,    45,    35,    48,    45,   134,   135,   291,
-      51,    12,   124,    40,    51,    42,   218,    48,    32,    33,
-      47,    35,    48,    46,    50,   142,     0,     1,    46,     3,
-       4,     5,     6,     7,     8,     9,    10,    53,   240,    33,
-      46,   179,    13,   170,   246,    33,    46,    49,    32,    48,
-      47,   168,    26,    27,    49,    46,    52,   195,   175,   186,
-      50,    46,    49,   180,    47,    45,    40,    46,    42,    50,
-      47,   188,    47,   200,   212,    45,    45,    49,   205,    47,
-     197,    45,    47,    45,    33,   287,    28,    29,    48,   206,
-      32,    33,    34,    35,    36,    49,   298,    45,   225,    45,
-      47,    52,   229,   230,   221,    45,    11,    48,    14,   229,
-     227,    50,   225,   298,   277,   253,   225,   285,     3,    -1,
-      -1,    -1,   249,    -1,   241,    -1,    -1,   265,    -1,    -1,
-      -1,   248,    -1,    -1,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,   262,   284,   264,   275,   287,
-      31,    32,    33,    -1,   271,     1,    -1,    -1,    39,   297,
-     298,    -1,    -1,    -1,   291,    11,    -1,    -1,    -1,   286,
+      17,   105,    14,   173,    42,    43,    44,    45,   173,     0,
+      48,   156,   230,    40,   118,    12,    12,   121,   209,   123,
+       9,    33,     3,   191,    34,   195,    33,   146,   132,    44,
+      46,   251,    33,    34,     0,    36,    51,    35,   203,    33,
+      50,   211,   146,    33,    51,    26,    27,    36,   153,   267,
+      47,    47,   156,   244,   274,    46,   224,    48,   177,    49,
+      54,    73,    33,   228,   168,   170,    42,   232,    33,    34,
+     278,    36,    49,   177,    51,    51,   221,    34,    49,    33,
+      34,    41,   252,    24,    49,    46,   294,    33,    34,   193,
+      36,    32,    33,    34,    28,    29,   113,   114,   243,    33,
+      34,    35,    36,    37,   249,    38,    39,    38,    39,   136,
+     137,    46,    52,    52,   126,     0,     1,   221,     3,     4,
+       5,     6,     7,     8,     9,    10,    47,   144,     4,     5,
+       6,     7,     8,     9,    10,    12,    47,    54,    34,   243,
+      47,    26,    27,    13,   182,   249,   173,    47,    34,    50,
+      49,    48,    50,    33,   171,    47,    41,    51,    43,    47,
+     198,   178,   189,    48,    48,    46,   183,    34,    47,    51,
+      53,    49,    46,    48,   191,    48,   203,   215,    50,    48,
+      46,   208,    46,   200,    49,    48,   290,    46,    50,    50,
+      46,    48,   209,    46,    46,    53,    11,   301,    14,   228,
+      51,   228,   232,   228,   301,   232,   233,   224,   280,   288,
+       3,    -1,    -1,   230,    -1,    -1,    -1,    -1,   256,    -1,
+      -1,    -1,    -1,    -1,    -1,   252,    -1,   244,    -1,    -1,
+     268,    -1,    -1,    -1,   251,    -1,    -1,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    -1,   265,   287,
+     267,   278,   290,    32,    33,    34,    -1,   274,     1,    -1,
+      -1,    -1,   300,   301,    -1,    -1,    -1,   294,    11,    -1,
+      -1,    -1,   289,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    -1,    -1,    -1,    -1,    -1,    31,    32,
+      33,    34,    -1,    -1,    -1,     1,    -1,    40,    41,    -1,
+      -1,    -1,    -1,    -1,    -1,    -1,    49,    -1,    51,    15,
       16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      -1,    -1,    -1,    -1,    -1,    31,    32,    33,    -1,    -1,
-      -1,     1,    -1,    39,    40,     4,     5,     6,     7,     8,
-       9,    10,    48,    -1,    50,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    -1,    -1,    -1,    -1,
-      30,    31,    32,    33,     1,    -1,    -1,    -1,    -1,    39,
-      40,    -1,    -1,    -1,    -1,    -1,    -1,    47,    15,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
-      -1,    -1,    -1,    30,    31,    32,    33,     1,    -1,    -1,
-      -1,    -1,    39,    40,    -1,    -1,    -1,    -1,    -1,    -1,
-      47,    -1,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    -1,    -1,    -1,    -1,    -1,    31,    32,    33,
-       1,    -1,    -1,    -1,    -1,    39,    40,    -1,    -1,    -1,
-      -1,    -1,    -1,    47,    -1,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    -1,    -1,    -1,    -1,    -1,
-      31,    32,    33,    -1,    -1,    -1,    -1,    -1,    39,    40,
-      -1,    -1,    -1,    -1,    -1,     1,    47,     3,     4,     5,
-       6,     7,     8,     9,    10,    -1,    -1,    15,    16,    17,
+      -1,    -1,    -1,    -1,    30,    31,    32,    33,    34,     1,
+      -1,    -1,    -1,    -1,    40,    41,    -1,    -1,    -1,    -1,
+      -1,    -1,    48,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    -1,    -1,    -1,    -1,    30,    31,
+      32,    33,    34,     1,    -1,    -1,    -1,    -1,    40,    41,
+      -1,    -1,    -1,    -1,    -1,    -1,    48,    -1,    16,    17,
       18,    19,    20,    21,    22,    23,    24,    25,    -1,    -1,
-      26,    27,    30,    31,    32,    33,    -1,    -1,    -1,    -1,
-      -1,    39,    -1,    -1,    40,    -1,    42,    -1,    -1,    -1,
-      -1,    47,     3,     4,     5,     6,     7,     8,     9,    10,
+      -1,    -1,    -1,    31,    32,    33,    34,     1,    -1,    -1,
+      -1,    -1,    40,    41,    -1,    -1,    -1,    -1,    -1,    -1,
+      48,    -1,    16,    17,    18,    19,    20,    21,    22,    23,
+      24,    25,    -1,    -1,    -1,    -1,    -1,    31,    32,    33,
+      34,    -1,    -1,    -1,    -1,    -1,    40,    41,    -1,    -1,
+      -1,    -1,    -1,     1,    48,     3,     4,     5,     6,     7,
+       8,     9,    10,    -1,    -1,    15,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    -1,    -1,    26,    27,
+      30,    31,    32,    33,    34,    -1,    -1,    -1,    -1,    -1,
+      40,    -1,    -1,    41,    -1,    43,    -1,    -1,    -1,    -1,
+      48,     3,     4,     5,     6,     7,     8,     9,    10,    11,
+      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
+      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
+      32,    -1,    34,     0,     1,    -1,     3,     4,     5,     6,
+       7,     8,     9,    10,    -1,    47,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    -1,    -1,    26,
+      27,    -1,    31,    32,    33,    34,    -1,    -1,    -1,    -1,
+      -1,    40,    -1,    -1,    41,    -1,    43,     3,     4,     5,
+       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
+      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
+      26,    27,    28,    29,    30,    31,    32,    -1,    34,    -1,
+      -1,    -1,    38,    39,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    30,    31,    32,    -1,    34,    -1,    -1,    -1,    38,
+       3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
+      13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
+      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
+      33,    34,     3,     4,     5,     6,     7,     8,     9,    10,
       11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
       21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    -1,    33,    -1,    -1,    -1,    -1,    -1,    -1,    -1,
-      -1,    -1,    -1,    -1,    -1,    46,     3,     4,     5,     6,
+      31,    32,    -1,    34,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    30,    31,    32,    -1,    34,     3,     4,     5,     6,
        7,     8,     9,    10,    11,    12,    13,    14,    15,    16,
       17,    18,    19,    20,    21,    22,    23,    24,    25,    26,
-      27,    28,    29,    30,    31,    -1,    33,    -1,    -1,    -1,
-      37,    38,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    -1,    33,    -1,    -1,    -1,    37,     3,     4,     5,
-       6,     7,     8,     9,    10,    11,    12,    13,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    24,    25,
-      26,    27,    28,    29,    30,    31,    32,    33,     3,     4,
+      27,    28,    29,    30,    31,    32,    -1,    34,     3,     4,
        5,     6,     7,     8,     9,    10,    11,    12,    13,    14,
       15,    16,    17,    18,    19,    20,    21,    22,    23,    24,
-      25,    26,    27,    28,    29,    30,    31,    -1,    33,     3,
-       4,     5,     6,     7,     8,     9,    10,    11,    12,    13,
-      14,    15,    16,    17,    18,    19,    20,    21,    22,    23,
-      24,    25,    26,    27,    28,    29,    30,    31,    -1,    33,
+      25,    26,    27,    28,    29,    30,    31,    32,    -1,    34,
        3,     4,     5,     6,     7,     8,     9,    10,    11,    12,
       13,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      23,    24,    25,    26,    27,    28,    29,    30,    31,    -1,
-      33,     3,     4,     5,     6,     7,     8,     9,    10,    11,
-      12,    13,    14,    15,    16,    17,    18,    19,    20,    21,
-      22,    23,    24,    25,    26,    27,    28,    29,    30,    31,
-      -1,    33,     3,     4,     5,     6,     7,     8,     9,    10,
+      23,    24,    25,    26,    27,    28,    29,    30,    31,    32,
+      -1,    34,     3,     4,     5,     6,     7,     8,     9,    10,
       11,    12,    13,    14,    15,    16,    17,    18,    19,    20,
       21,    22,    23,    24,    25,    26,    27,    28,    29,    30,
-      31,    -1,    33,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    -1,    33,     3,     4,     5,     6,     7,     8,
+      31,    32,    -1,    34,     3,     4,     5,     6,     7,     8,
        9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
       19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
-      29,    30,    31,    -1,    33,    16,    17,    18,    19,    20,
-      21,    22,    23,    24,    25,    -1,    -1,    -1,    -1,    -1,
-      31,    32,    33,    -1,    -1,    -1,    -1,    -1,    39,    16,
-      17,    18,    19,    20,    21,    22,    23,    24,    25,    -1,
-      -1,    -1,    -1,    -1,    -1,    32,    33
+      29,    30,    31,    32,    -1,    34,    16,    17,    18,    19,
+      20,    21,    22,    23,    24,    25,    -1,    -1,    -1,    -1,
+      -1,    31,    32,    33,    34,    -1,    -1,    -1,    -1,    -1,
+      40
 };
 
-/* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
-   symbol of state STATE-NUM.  */
+  /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
+     symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,     1,    40,    42,    55,    56,    57,    58,    45,    34,
-     120,   121,   121,     0,    59,     3,    26,    27,    62,    63,
-      66,    67,    76,    77,    83,    84,    98,    99,   107,   108,
-     110,   122,   124,    61,   120,    41,    50,    43,    58,    33,
-      57,    60,     4,     5,     6,     7,     8,     9,    10,    65,
-      75,    81,    82,    97,   109,    58,   120,    64,    16,    17,
+       0,     1,    41,    43,    56,    57,    58,    59,    46,    35,
+     121,   122,   122,     0,    60,     3,    26,    27,    63,    64,
+      67,    68,    77,    78,    84,    85,    99,   100,   108,   109,
+     111,   123,   125,    62,   121,    42,    51,    44,    59,    34,
+      58,    61,     4,     5,     6,     7,     8,     9,    10,    66,
+      76,    82,    83,    98,   110,    59,   121,    65,    16,    17,
       18,    19,    20,    21,    22,    23,    24,    25,    32,    33,
-     118,   119,    45,     3,     4,     5,     6,     7,     8,     9,
-      10,    11,    12,    13,    14,    15,    16,    17,    18,    19,
-      20,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      30,    31,    33,    37,   125,    33,   125,    33,   125,    33,
-     125,    51,    51,    33,    46,   125,    12,    69,    78,    12,
-      86,    12,   102,   111,    46,    53,    33,    32,    53,    33,
-      49,    58,    35,   118,    57,    57,    33,   112,   113,   125,
-     118,    68,    46,   118,    13,    87,    24,   101,   118,   100,
-      46,    58,    33,    49,    28,    29,    34,    35,    36,   118,
-     123,    48,    48,   119,   119,    49,    47,    50,    46,     1,
-      57,    79,   101,    85,    50,    46,   112,    47,   123,    52,
-      50,    35,   114,   118,   112,     1,    57,    70,    45,    31,
-      39,    71,    72,    80,    90,   119,    47,    46,   101,     1,
-      57,   103,    47,    33,   125,    57,    45,    71,    72,    73,
-      74,    89,   119,    47,    79,    35,    48,   118,    49,    71,
-     119,    45,    33,   125,     1,    57,    88,    45,    15,    30,
-      72,    91,    92,    93,   104,   119,    47,   119,    70,    71,
-      49,    45,   125,    48,    48,   123,    49,    79,    45,    72,
-      89,    93,    96,   119,    47,   103,    91,   119,    37,    38,
-       1,    11,   115,   116,    45,    52,   123,    70,   123,    88,
-     119,    45,    37,    38,    48,    57,    48,    50,   103,    33,
-     125,    88,    95,    73,   119,    94,   115,    14,   117,   125,
-     117,    57,   105,   106,   118,   125,    73,   119,    50,   125,
-     105
+      34,   119,   120,    46,     3,     4,     5,     6,     7,     8,
+       9,    10,    11,    12,    13,    14,    15,    16,    17,    18,
+      19,    20,    21,    22,    23,    24,    25,    26,    27,    28,
+      29,    30,    31,    32,    34,    38,   126,    34,   126,    34,
+     126,    34,   126,    52,    52,    34,    47,   126,    12,    70,
+      79,    12,    87,    12,   103,   112,    47,    54,    34,    33,
+      54,    34,    50,    59,    36,   119,    58,    58,    34,   113,
+     114,   126,   119,    69,    47,   119,    13,    88,    24,    32,
+     102,   119,   101,    47,    59,    34,    50,    28,    29,    35,
+      36,    37,   119,   124,    49,    49,   120,   120,    50,    48,
+      51,    47,     1,    58,    80,   102,    86,    51,    47,   113,
+      48,   124,    53,    51,    36,   115,   119,   113,     1,    58,
+      71,    46,    31,    40,    72,    73,    81,    91,   120,    48,
+      47,   102,     1,    58,   104,    48,    34,   126,    58,    46,
+      72,    73,    74,    75,    90,   120,    48,    80,    36,    49,
+     119,    50,    72,   120,    46,    34,   126,     1,    58,    89,
+      46,    15,    30,    73,    92,    93,    94,   105,   120,    48,
+     120,    71,    72,    50,    46,   126,    49,    49,   124,    50,
+      80,    46,    73,    90,    94,    97,   120,    48,   104,    92,
+     120,    38,    39,     1,    11,   116,   117,    46,    53,   124,
+      71,   124,    89,   120,    46,    38,    39,    49,    58,    49,
+      51,   104,    34,   126,    89,    96,    74,   120,    95,   116,
+      14,   118,   126,   118,    58,   106,   107,   119,   126,    74,
+     120,    51,   126,   106
+};
+
+  /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
+static const yytype_uint8 yyr1[] =
+{
+       0,    55,    56,    57,    58,    58,    60,    59,    61,    59,
+      62,    59,    59,    59,    63,    63,    63,    63,    63,    63,
+      63,    63,    63,    63,    63,    63,    63,    65,    64,    66,
+      66,    67,    69,    68,    70,    70,    71,    71,    71,    71,
+      72,    73,    73,    73,    73,    74,    74,    75,    76,    76,
+      77,    79,    78,    80,    80,    80,    80,    81,    82,    82,
+      83,    83,    83,    84,    86,    85,    87,    87,    88,    88,
+      89,    89,    89,    89,    90,    90,    90,    90,    91,    91,
+      91,    91,    91,    91,    92,    92,    92,    93,    93,    93,
+      93,    95,    94,    96,    94,    97,    97,    98,    98,    99,
+     101,   100,   102,   102,   102,   102,   103,   103,   104,   104,
+     104,   104,   105,   106,   106,   107,   107,   108,   108,   109,
+     109,   110,   110,   112,   111,   111,   113,   113,   114,   114,
+     114,   114,   115,   115,   116,   116,   117,   117,   117,   117,
+     117,   117,   117,   118,   118,   119,   119,   119,   120,   120,
+     120,   120,   120,   120,   120,   120,   120,   120,   120,   120,
+     120,   120,   121,   121,   122,   122,   123,   123,   124,   124,
+     124,   124,   124,   124,   125,   125,   126,   126,   126,   126,
+     126,   126,   126,   126,   126,   126,   126,   126,   126,   126,
+     126,   126,   126,   126,   126,   126,   126,   126,   126,   126,
+     126,   126,   126,   126,   126,   126
 };
 
-#define yyerrok		(yyerrstatus = 0)
-#define yyclearin	(yychar = YYEMPTY)
-#define YYEMPTY		(-2)
-#define YYEOF		0
+  /* YYR2[YYN] -- Number of symbols on the right hand side of rule YYN.  */
+static const yytype_uint8 yyr2[] =
+{
+       0,     2,     1,     3,     3,     0,     0,     3,     0,     5,
+       0,     4,     2,     0,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     0,     6,     2,
+       2,     2,     0,     7,     2,     0,     4,     3,     2,     0,
+       2,     3,     3,     2,     1,     2,     1,     1,     2,     2,
+       2,     0,     6,     4,     3,     2,     0,     1,     2,     2,
+       4,     4,     1,     2,     0,     8,     2,     0,     2,     0,
+       4,     3,     2,     0,     1,     3,     2,     1,     1,     3,
+       2,     4,     2,     1,     2,     1,     1,     2,     3,     2,
+       3,     0,     5,     0,     5,     1,     1,     2,     2,     2,
+       0,     7,     3,     1,     1,     1,     2,     0,     4,     3,
+       2,     0,     1,     3,     1,     1,     1,     7,     7,    10,
+      10,     2,     2,     0,     6,     5,     3,     1,     1,     3,
+       1,     0,     1,     1,     1,     0,     0,     3,     5,     4,
+       6,     3,     5,     2,     0,     1,     2,     3,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     2,     1,     1,
+       1,     2,     2,     1,     3,     1,     1,     0,     1,     1,
+       1,     1,     1,     1,     6,     5,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1,     1,     1,     1,     1,
+       1,     1,     1,     1,     1,     1
+};
 
-#define YYACCEPT	goto yyacceptlab
-#define YYABORT		goto yyabortlab
-#define YYERROR		goto yyerrorlab
 
+#define yyerrok         (yyerrstatus = 0)
+#define yyclearin       (yychar = YYEMPTY)
+#define YYEMPTY         (-2)
+#define YYEOF           0
 
-/* Like YYERROR except do call yyerror.  This remains here temporarily
-   to ease the transition to the new meaning of YYERROR, for GCC.
-   Once GCC version 2 has supplanted version 1, this can go.  */
+#define YYACCEPT        goto yyacceptlab
+#define YYABORT         goto yyabortlab
+#define YYERROR         goto yyerrorlab
 
-#define YYFAIL		goto yyerrlab
 
 #define YYRECOVERING()  (!!yyerrstatus)
 
-#define YYBACKUP(Token, Value)					\
-do								\
-  if (yychar == YYEMPTY && yylen == 1)				\
-    {								\
-      yychar = (Token);						\
-      yylval = (Value);						\
-      yytoken = YYTRANSLATE (yychar);				\
-      YYPOPSTACK (1);						\
-      goto yybackup;						\
-    }								\
-  else								\
-    {								\
+#define YYBACKUP(Token, Value)                                  \
+do                                                              \
+  if (yychar == YYEMPTY)                                        \
+    {                                                           \
+      yychar = (Token);                                         \
+      yylval = (Value);                                         \
+      YYPOPSTACK (yylen);                                       \
+      yystate = *yyssp;                                         \
+      goto yybackup;                                            \
+    }                                                           \
+  else                                                          \
+    {                                                           \
       yyerror (YY_("syntax error: cannot back up")); \
-      YYERROR;							\
-    }								\
-while (YYID (0))
-
-
-#define YYTERROR	1
-#define YYERRCODE	256
-
-
-/* YYLLOC_DEFAULT -- Set CURRENT to span from RHS[1] to RHS[N].
-   If N is 0, then set CURRENT to the empty location which ends
-   the previous symbol: RHS[0] (always defined).  */
-
-#define YYRHSLOC(Rhs, K) ((Rhs)[K])
-#ifndef YYLLOC_DEFAULT
-# define YYLLOC_DEFAULT(Current, Rhs, N)				\
-    do									\
-      if (YYID (N))                                                    \
-	{								\
-	  (Current).first_line   = YYRHSLOC (Rhs, 1).first_line;	\
-	  (Current).first_column = YYRHSLOC (Rhs, 1).first_column;	\
-	  (Current).last_line    = YYRHSLOC (Rhs, N).last_line;		\
-	  (Current).last_column  = YYRHSLOC (Rhs, N).last_column;	\
-	}								\
-      else								\
-	{								\
-	  (Current).first_line   = (Current).last_line   =		\
-	    YYRHSLOC (Rhs, 0).last_line;				\
-	  (Current).first_column = (Current).last_column =		\
-	    YYRHSLOC (Rhs, 0).last_column;				\
-	}								\
-    while (YYID (0))
-#endif
+      YYERROR;                                                  \
+    }                                                           \
+while (0)
 
+/* Error token number */
+#define YYTERROR        1
+#define YYERRCODE       256
 
-/* YY_LOCATION_PRINT -- Print the location on the stream.
-   This macro was not mandated originally: define only if we know
-   we won't break user code: when these are the locations we know.  */
 
-#ifndef YY_LOCATION_PRINT
-# if YYLTYPE_IS_TRIVIAL
-#  define YY_LOCATION_PRINT(File, Loc)			\
-     fprintf (File, "%d.%d-%d.%d",			\
-	      (Loc).first_line, (Loc).first_column,	\
-	      (Loc).last_line,  (Loc).last_column)
-# else
-#  define YY_LOCATION_PRINT(File, Loc) ((void) 0)
-# endif
-#endif
-
-
-/* YYLEX -- calling `yylex' with the right arguments.  */
-
-#ifdef YYLEX_PARAM
-# define YYLEX yylex (&yylval, YYLEX_PARAM)
-#else
-# define YYLEX yylex (&yylval)
-#endif
 
 /* Enable debugging if requested.  */
 #if YYDEBUG
@@ -1133,54 +1033,46 @@ while (YYID (0))
 #  define YYFPRINTF fprintf
 # endif
 
-# define YYDPRINTF(Args)			\
-do {						\
-  if (yydebug)					\
-    YYFPRINTF Args;				\
-} while (YYID (0))
+# define YYDPRINTF(Args)                        \
+do {                                            \
+  if (yydebug)                                  \
+    YYFPRINTF Args;                             \
+} while (0)
 
-# define YY_SYMBOL_PRINT(Title, Type, Value, Location)			  \
-do {									  \
-  if (yydebug)								  \
-    {									  \
-      YYFPRINTF (stderr, "%s ", Title);					  \
-      yy_symbol_print (stderr,						  \
-		  Type, Value); \
-      YYFPRINTF (stderr, "\n");						  \
-    }									  \
-} while (YYID (0))
+/* This macro is provided for backward compatibility. */
+#ifndef YY_LOCATION_PRINT
+# define YY_LOCATION_PRINT(File, Loc) ((void) 0)
+#endif
 
 
-/*--------------------------------.
-| Print this symbol on YYOUTPUT.  |
-`--------------------------------*/
+# define YY_SYMBOL_PRINT(Title, Type, Value, Location)                    \
+do {                                                                      \
+  if (yydebug)                                                            \
+    {                                                                     \
+      YYFPRINTF (stderr, "%s ", Title);                                   \
+      yy_symbol_print (stderr,                                            \
+                  Type, Value); \
+      YYFPRINTF (stderr, "\n");                                           \
+    }                                                                     \
+} while (0)
+
+
+/*----------------------------------------.
+| Print this symbol's value on YYOUTPUT.  |
+`----------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
 {
+  FILE *yyo = yyoutput;
+  YYUSE (yyo);
   if (!yyvaluep)
     return;
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
-# else
-  YYUSE (yyoutput);
 # endif
-  switch (yytype)
-    {
-      default:
-	break;
-    }
+  YYUSE (yytype);
 }
 
 
@@ -1188,22 +1080,11 @@ yy_symbol_value_print (yyoutput, yytype, yyvaluep)
 | Print this symbol on YYOUTPUT.  |
 `--------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
-#else
-static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
-    FILE *yyoutput;
-    int yytype;
-    YYSTYPE const * const yyvaluep;
-#endif
 {
-  if (yytype < YYNTOKENS)
-    YYFPRINTF (yyoutput, "token %s (", yytname[yytype]);
-  else
-    YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
+  YYFPRINTF (yyoutput, "%s %s (",
+             yytype < YYNTOKENS ? "token" : "nterm", yytname[yytype]);
 
   yy_symbol_value_print (yyoutput, yytype, yyvaluep);
   YYFPRINTF (yyoutput, ")");
@@ -1214,16 +1095,8 @@ yy_symbol_print (yyoutput, yytype, yyvaluep)
 | TOP (included).                                                   |
 `------------------------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yy_stack_print (yytype_int16 *yybottom, yytype_int16 *yytop)
-#else
-static void
-yy_stack_print (yybottom, yytop)
-    yytype_int16 *yybottom;
-    yytype_int16 *yytop;
-#endif
 {
   YYFPRINTF (stderr, "Stack now");
   for (; yybottom <= yytop; yybottom++)
@@ -1234,49 +1107,42 @@ yy_stack_print (yybottom, yytop)
   YYFPRINTF (stderr, "\n");
 }
 
-# define YY_STACK_PRINT(Bottom, Top)				\
-do {								\
-  if (yydebug)							\
-    yy_stack_print ((Bottom), (Top));				\
-} while (YYID (0))
+# define YY_STACK_PRINT(Bottom, Top)                            \
+do {                                                            \
+  if (yydebug)                                                  \
+    yy_stack_print ((Bottom), (Top));                           \
+} while (0)
 
 
 /*------------------------------------------------.
 | Report that the YYRULE is going to be reduced.  |
 `------------------------------------------------*/
 
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
-#else
-static void
-yy_reduce_print (yyvsp, yyrule)
-    YYSTYPE *yyvsp;
-    int yyrule;
-#endif
+yy_reduce_print (yytype_int16 *yyssp, YYSTYPE *yyvsp, int yyrule)
 {
+  unsigned long int yylno = yyrline[yyrule];
   int yynrhs = yyr2[yyrule];
   int yyi;
-  unsigned long int yylno = yyrline[yyrule];
   YYFPRINTF (stderr, "Reducing stack by rule %d (line %lu):\n",
-	     yyrule - 1, yylno);
+             yyrule - 1, yylno);
   /* The symbols being reduced.  */
   for (yyi = 0; yyi < yynrhs; yyi++)
     {
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
-      yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
-		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		       		       );
+      yy_symbol_print (stderr,
+                       yystos[yyssp[yyi + 1 - yynrhs]],
+                       &(yyvsp[(yyi + 1) - (yynrhs)])
+                                              );
       YYFPRINTF (stderr, "\n");
     }
 }
 
-# define YY_REDUCE_PRINT(Rule)		\
-do {					\
-  if (yydebug)				\
-    yy_reduce_print (yyvsp, Rule); \
-} while (YYID (0))
+# define YY_REDUCE_PRINT(Rule)          \
+do {                                    \
+  if (yydebug)                          \
+    yy_reduce_print (yyssp, yyvsp, Rule); \
+} while (0)
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
    multiple parsers can coexist.  */
@@ -1290,7 +1156,7 @@ int yydebug;
 
 
 /* YYINITDEPTH -- initial size of the parser's stacks.  */
-#ifndef	YYINITDEPTH
+#ifndef YYINITDEPTH
 # define YYINITDEPTH 200
 #endif
 
@@ -1305,7 +1171,6 @@ int yydebug;
 # define YYMAXDEPTH 10000
 #endif
 
-
 
 #if YYERROR_VERBOSE
 
@@ -1314,15 +1179,8 @@ int yydebug;
 #   define yystrlen strlen
 #  else
 /* Return the length of YYSTR.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static YYSIZE_T
 yystrlen (const char *yystr)
-#else
-static YYSIZE_T
-yystrlen (yystr)
-    const char *yystr;
-#endif
 {
   YYSIZE_T yylen;
   for (yylen = 0; yystr[yylen]; yylen++)
@@ -1338,16 +1196,8 @@ yystrlen (yystr)
 #  else
 /* Copy YYSRC to YYDEST, returning the address of the terminating '\0' in
    YYDEST.  */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static char *
 yystpcpy (char *yydest, const char *yysrc)
-#else
-static char *
-yystpcpy (yydest, yysrc)
-    char *yydest;
-    const char *yysrc;
-#endif
 {
   char *yyd = yydest;
   const char *yys = yysrc;
@@ -1377,27 +1227,27 @@ yytnamerr (char *yyres, const char *yystr)
       char const *yyp = yystr;
 
       for (;;)
-	switch (*++yyp)
-	  {
-	  case '\'':
-	  case ',':
-	    goto do_not_strip_quotes;
-
-	  case '\\':
-	    if (*++yyp != '\\')
-	      goto do_not_strip_quotes;
-	    /* Fall through.  */
-	  default:
-	    if (yyres)
-	      yyres[yyn] = *yyp;
-	    yyn++;
-	    break;
-
-	  case '"':
-	    if (yyres)
-	      yyres[yyn] = '\0';
-	    return yyn;
-	  }
+        switch (*++yyp)
+          {
+          case '\'':
+          case ',':
+            goto do_not_strip_quotes;
+
+          case '\\':
+            if (*++yyp != '\\')
+              goto do_not_strip_quotes;
+            /* Fall through.  */
+          default:
+            if (yyres)
+              yyres[yyn] = *yyp;
+            yyn++;
+            break;
+
+          case '"':
+            if (yyres)
+              yyres[yyn] = '\0';
+            return yyn;
+          }
     do_not_strip_quotes: ;
     }
 
@@ -1408,197 +1258,178 @@ yytnamerr (char *yyres, const char *yystr)
 }
 # endif
 
-/* Copy into YYRESULT an error message about the unexpected token
-   YYCHAR while in state YYSTATE.  Return the number of bytes copied,
-   including the terminating null byte.  If YYRESULT is null, do not
-   copy anything; just return the number of bytes that would be
-   copied.  As a special case, return 0 if an ordinary "syntax error"
-   message will do.  Return YYSIZE_MAXIMUM if overflow occurs during
-   size calculation.  */
-static YYSIZE_T
-yysyntax_error (char *yyresult, int yystate, int yychar)
+/* Copy into *YYMSG, which is of size *YYMSG_ALLOC, an error message
+   about the unexpected token YYTOKEN for the state stack whose top is
+   YYSSP.
+
+   Return 0 if *YYMSG was successfully written.  Return 1 if *YYMSG is
+   not large enough to hold the message.  In that case, also set
+   *YYMSG_ALLOC to the required number of bytes.  Return 2 if the
+   required number of bytes is too large to store.  */
+static int
+yysyntax_error (YYSIZE_T *yymsg_alloc, char **yymsg,
+                yytype_int16 *yyssp, int yytoken)
 {
-  int yyn = yypact[yystate];
+  YYSIZE_T yysize0 = yytnamerr (YY_NULLPTR, yytname[yytoken]);
+  YYSIZE_T yysize = yysize0;
+  enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
+  /* Internationalized format string. */
+  const char *yyformat = YY_NULLPTR;
+  /* Arguments of yyformat. */
+  char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
+  /* Number of reported tokens (one for the "unexpected", one per
+     "expected"). */
+  int yycount = 0;
+
+  /* There are many possibilities here to consider:
+     - If this state is a consistent state with a default action, then
+       the only way this function was invoked is if the default action
+       is an error action.  In that case, don't check for expected
+       tokens because there are none.
+     - The only way there can be no lookahead present (in yychar) is if
+       this state is a consistent state with a default action.  Thus,
+       detecting the absence of a lookahead is sufficient to determine
+       that there is no unexpected or expected token to report.  In that
+       case, just report a simple "syntax error".
+     - Don't assume there isn't a lookahead just because this state is a
+       consistent state with a default action.  There might have been a
+       previous inconsistent state, consistent state with a non-default
+       action, or user semantic action that manipulated yychar.
+     - Of course, the expected token list depends on states to have
+       correct lookahead information, and it depends on the parser not
+       to perform extra reductions after fetching a lookahead from the
+       scanner and before detecting a syntax error.  Thus, state merging
+       (from LALR or IELR) and default reductions corrupt the expected
+       token list.  However, the list is correct for canonical LR with
+       one exception: it will still contain any token that will not be
+       accepted due to an error action in a later state.
+  */
+  if (yytoken != YYEMPTY)
+    {
+      int yyn = yypact[*yyssp];
+      yyarg[yycount++] = yytname[yytoken];
+      if (!yypact_value_is_default (yyn))
+        {
+          /* Start YYX at -YYN if negative to avoid negative indexes in
+             YYCHECK.  In other words, skip the first -YYN actions for
+             this state because they are default actions.  */
+          int yyxbegin = yyn < 0 ? -yyn : 0;
+          /* Stay within bounds of both yycheck and yytname.  */
+          int yychecklim = YYLAST - yyn + 1;
+          int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
+          int yyx;
+
+          for (yyx = yyxbegin; yyx < yyxend; ++yyx)
+            if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR
+                && !yytable_value_is_error (yytable[yyx + yyn]))
+              {
+                if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
+                  {
+                    yycount = 1;
+                    yysize = yysize0;
+                    break;
+                  }
+                yyarg[yycount++] = yytname[yyx];
+                {
+                  YYSIZE_T yysize1 = yysize + yytnamerr (YY_NULLPTR, yytname[yyx]);
+                  if (! (yysize <= yysize1
+                         && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+                    return 2;
+                  yysize = yysize1;
+                }
+              }
+        }
+    }
 
-  if (! (YYPACT_NINF < yyn && yyn <= YYLAST))
-    return 0;
-  else
+  switch (yycount)
+    {
+# define YYCASE_(N, S)                      \
+      case N:                               \
+        yyformat = S;                       \
+      break
+      YYCASE_(0, YY_("syntax error"));
+      YYCASE_(1, YY_("syntax error, unexpected %s"));
+      YYCASE_(2, YY_("syntax error, unexpected %s, expecting %s"));
+      YYCASE_(3, YY_("syntax error, unexpected %s, expecting %s or %s"));
+      YYCASE_(4, YY_("syntax error, unexpected %s, expecting %s or %s or %s"));
+      YYCASE_(5, YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s"));
+# undef YYCASE_
+    }
+
+  {
+    YYSIZE_T yysize1 = yysize + yystrlen (yyformat);
+    if (! (yysize <= yysize1 && yysize1 <= YYSTACK_ALLOC_MAXIMUM))
+      return 2;
+    yysize = yysize1;
+  }
+
+  if (*yymsg_alloc < yysize)
     {
-      int yytype = YYTRANSLATE (yychar);
-      YYSIZE_T yysize0 = yytnamerr (0, yytname[yytype]);
-      YYSIZE_T yysize = yysize0;
-      YYSIZE_T yysize1;
-      int yysize_overflow = 0;
-      enum { YYERROR_VERBOSE_ARGS_MAXIMUM = 5 };
-      char const *yyarg[YYERROR_VERBOSE_ARGS_MAXIMUM];
-      int yyx;
-
-# if 0
-      /* This is so xgettext sees the translatable formats that are
-	 constructed on the fly.  */
-      YY_("syntax error, unexpected %s");
-      YY_("syntax error, unexpected %s, expecting %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s");
-      YY_("syntax error, unexpected %s, expecting %s or %s or %s or %s");
-# endif
-      char *yyfmt;
-      char const *yyf;
-      static char const yyunexpected[] = "syntax error, unexpected %s";
-      static char const yyexpecting[] = ", expecting %s";
-      static char const yyor[] = " or %s";
-      char yyformat[sizeof yyunexpected
-		    + sizeof yyexpecting - 1
-		    + ((YYERROR_VERBOSE_ARGS_MAXIMUM - 2)
-		       * (sizeof yyor - 1))];
-      char const *yyprefix = yyexpecting;
-
-      /* Start YYX at -YYN if negative to avoid negative indexes in
-	 YYCHECK.  */
-      int yyxbegin = yyn < 0 ? -yyn : 0;
-
-      /* Stay within bounds of both yycheck and yytname.  */
-      int yychecklim = YYLAST - yyn + 1;
-      int yyxend = yychecklim < YYNTOKENS ? yychecklim : YYNTOKENS;
-      int yycount = 1;
-
-      yyarg[0] = yytname[yytype];
-      yyfmt = yystpcpy (yyformat, yyunexpected);
-
-      for (yyx = yyxbegin; yyx < yyxend; ++yyx)
-	if (yycheck[yyx + yyn] == yyx && yyx != YYTERROR)
-	  {
-	    if (yycount == YYERROR_VERBOSE_ARGS_MAXIMUM)
-	      {
-		yycount = 1;
-		yysize = yysize0;
-		yyformat[sizeof yyunexpected - 1] = '\0';
-		break;
-	      }
-	    yyarg[yycount++] = yytname[yyx];
-	    yysize1 = yysize + yytnamerr (0, yytname[yyx]);
-	    yysize_overflow |= (yysize1 < yysize);
-	    yysize = yysize1;
-	    yyfmt = yystpcpy (yyfmt, yyprefix);
-	    yyprefix = yyor;
-	  }
-
-      yyf = YY_(yyformat);
-      yysize1 = yysize + yystrlen (yyf);
-      yysize_overflow |= (yysize1 < yysize);
-      yysize = yysize1;
-
-      if (yysize_overflow)
-	return YYSIZE_MAXIMUM;
-
-      if (yyresult)
-	{
-	  /* Avoid sprintf, as that infringes on the user's name space.
-	     Don't have undefined behavior even if the translation
-	     produced a string with the wrong number of "%s"s.  */
-	  char *yyp = yyresult;
-	  int yyi = 0;
-	  while ((*yyp = *yyf) != '\0')
-	    {
-	      if (*yyp == '%' && yyf[1] == 's' && yyi < yycount)
-		{
-		  yyp += yytnamerr (yyp, yyarg[yyi++]);
-		  yyf += 2;
-		}
-	      else
-		{
-		  yyp++;
-		  yyf++;
-		}
-	    }
-	}
-      return yysize;
+      *yymsg_alloc = 2 * yysize;
+      if (! (yysize <= *yymsg_alloc
+             && *yymsg_alloc <= YYSTACK_ALLOC_MAXIMUM))
+        *yymsg_alloc = YYSTACK_ALLOC_MAXIMUM;
+      return 1;
     }
+
+  /* Avoid sprintf, as that infringes on the user's name space.
+     Don't have undefined behavior even if the translation
+     produced a string with the wrong number of "%s"s.  */
+  {
+    char *yyp = *yymsg;
+    int yyi = 0;
+    while ((*yyp = *yyformat) != '\0')
+      if (*yyp == '%' && yyformat[1] == 's' && yyi < yycount)
+        {
+          yyp += yytnamerr (yyp, yyarg[yyi++]);
+          yyformat += 2;
+        }
+      else
+        {
+          yyp++;
+          yyformat++;
+        }
+  }
+  return 0;
 }
 #endif /* YYERROR_VERBOSE */
-
 
 /*-----------------------------------------------.
 | Release the memory associated to this symbol.  |
 `-----------------------------------------------*/
 
-/*ARGSUSED*/
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 static void
 yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
-#else
-static void
-yydestruct (yymsg, yytype, yyvaluep)
-    const char *yymsg;
-    int yytype;
-    YYSTYPE *yyvaluep;
-#endif
 {
   YYUSE (yyvaluep);
-
   if (!yymsg)
     yymsg = "Deleting";
   YY_SYMBOL_PRINT (yymsg, yytype, yyvaluep, yylocationp);
 
-  switch (yytype)
-    {
-
-      default:
-	break;
-    }
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
+  YYUSE (yytype);
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 }
 
-/* Prevent warnings from -Wmissing-prototypes.  */
-#ifdef YYPARSE_PARAM
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void *YYPARSE_PARAM);
-#else
-int yyparse ();
-#endif
-#else /* ! YYPARSE_PARAM */
-#if defined __STDC__ || defined __cplusplus
-int yyparse (void);
-#else
-int yyparse ();
-#endif
-#endif /* ! YYPARSE_PARAM */
-
-
 
 
 
-/*-------------------------.
-| yyparse or yypush_parse.  |
-`-------------------------*/
+/*----------.
+| yyparse.  |
+`----------*/
 
-#ifdef YYPARSE_PARAM
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
-int
-yyparse (void *YYPARSE_PARAM)
-#else
-int
-yyparse (YYPARSE_PARAM)
-    void *YYPARSE_PARAM;
-#endif
-#else /* ! YYPARSE_PARAM */
-#if (defined __STDC__ || defined __C99__FUNC__ \
-     || defined __cplusplus || defined _MSC_VER)
 int
 yyparse (void)
-#else
-int
-yyparse ()
-
-#endif
-#endif
 {
 /* The lookahead symbol.  */
 int yychar;
 
+
 /* The semantic value of the lookahead symbol.  */
-YYSTYPE yylval;
+/* Default value used for initialization, for pacifying older GCCs
+   or non-GCC compilers.  */
+YY_INITIAL_VALUE (static YYSTYPE yyval_default;)
+YYSTYPE yylval YY_INITIAL_VALUE (= yyval_default);
 
     /* Number of syntax errors so far.  */
     int yynerrs;
@@ -1608,10 +1439,10 @@ YYSTYPE yylval;
     int yyerrstatus;
 
     /* The stacks and their tools:
-       `yyss': related to states.
-       `yyvs': related to semantic values.
+       'yyss': related to states.
+       'yyvs': related to semantic values.
 
-       Refer to the stacks thru separate pointers, to allow yyoverflow
+       Refer to the stacks through separate pointers, to allow yyoverflow
        to reallocate them elsewhere.  */
 
     /* The state stack.  */
@@ -1629,7 +1460,7 @@ YYSTYPE yylval;
   int yyn;
   int yyresult;
   /* Lookahead token as an internal (translated) token number.  */
-  int yytoken;
+  int yytoken = 0;
   /* The variables used to return semantic value and location from the
      action routines.  */
   YYSTYPE yyval;
@@ -1647,9 +1478,8 @@ YYSTYPE yylval;
      Keep to zero when no symbol should be popped.  */
   int yylen = 0;
 
-  yytoken = 0;
-  yyss = yyssa;
-  yyvs = yyvsa;
+  yyssp = yyss = yyssa;
+  yyvsp = yyvs = yyvsa;
   yystacksize = YYINITDEPTH;
 
   YYDPRINTF ((stderr, "Starting parse\n"));
@@ -1658,14 +1488,6 @@ YYSTYPE yylval;
   yyerrstatus = 0;
   yynerrs = 0;
   yychar = YYEMPTY; /* Cause a token to be read.  */
-
-  /* Initialize stack pointers.
-     Waste one element of value and location stack
-     so that they stay on the same level as the state stack.
-     The wasted elements are never initialized.  */
-  yyssp = yyss;
-  yyvsp = yyvs;
-
   goto yysetstate;
 
 /*------------------------------------------------------------.
@@ -1686,23 +1508,23 @@ YYSTYPE yylval;
 
 #ifdef yyoverflow
       {
-	/* Give user a chance to reallocate the stack.  Use copies of
-	   these so that the &'s don't force the real ones into
-	   memory.  */
-	YYSTYPE *yyvs1 = yyvs;
-	yytype_int16 *yyss1 = yyss;
-
-	/* Each stack pointer address is followed by the size of the
-	   data in use in that stack, in bytes.  This used to be a
-	   conditional around just the two extra args, but that might
-	   be undefined if yyoverflow is a macro.  */
-	yyoverflow (YY_("memory exhausted"),
-		    &yyss1, yysize * sizeof (*yyssp),
-		    &yyvs1, yysize * sizeof (*yyvsp),
-		    &yystacksize);
-
-	yyss = yyss1;
-	yyvs = yyvs1;
+        /* Give user a chance to reallocate the stack.  Use copies of
+           these so that the &'s don't force the real ones into
+           memory.  */
+        YYSTYPE *yyvs1 = yyvs;
+        yytype_int16 *yyss1 = yyss;
+
+        /* Each stack pointer address is followed by the size of the
+           data in use in that stack, in bytes.  This used to be a
+           conditional around just the two extra args, but that might
+           be undefined if yyoverflow is a macro.  */
+        yyoverflow (YY_("memory exhausted"),
+                    &yyss1, yysize * sizeof (*yyssp),
+                    &yyvs1, yysize * sizeof (*yyvsp),
+                    &yystacksize);
+
+        yyss = yyss1;
+        yyvs = yyvs1;
       }
 #else /* no yyoverflow */
 # ifndef YYSTACK_RELOCATE
@@ -1710,22 +1532,22 @@ YYSTYPE yylval;
 # else
       /* Extend the stack our own way.  */
       if (YYMAXDEPTH <= yystacksize)
-	goto yyexhaustedlab;
+        goto yyexhaustedlab;
       yystacksize *= 2;
       if (YYMAXDEPTH < yystacksize)
-	yystacksize = YYMAXDEPTH;
+        yystacksize = YYMAXDEPTH;
 
       {
-	yytype_int16 *yyss1 = yyss;
-	union yyalloc *yyptr =
-	  (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
-	if (! yyptr)
-	  goto yyexhaustedlab;
-	YYSTACK_RELOCATE (yyss_alloc, yyss);
-	YYSTACK_RELOCATE (yyvs_alloc, yyvs);
+        yytype_int16 *yyss1 = yyss;
+        union yyalloc *yyptr =
+          (union yyalloc *) YYSTACK_ALLOC (YYSTACK_BYTES (yystacksize));
+        if (! yyptr)
+          goto yyexhaustedlab;
+        YYSTACK_RELOCATE (yyss_alloc, yyss);
+        YYSTACK_RELOCATE (yyvs_alloc, yyvs);
 #  undef YYSTACK_RELOCATE
-	if (yyss1 != yyssa)
-	  YYSTACK_FREE (yyss1);
+        if (yyss1 != yyssa)
+          YYSTACK_FREE (yyss1);
       }
 # endif
 #endif /* no yyoverflow */
@@ -1734,10 +1556,10 @@ YYSTYPE yylval;
       yyvsp = yyvs + yysize - 1;
 
       YYDPRINTF ((stderr, "Stack size increased to %lu\n",
-		  (unsigned long int) yystacksize));
+                  (unsigned long int) yystacksize));
 
       if (yyss + yystacksize - 1 <= yyssp)
-	YYABORT;
+        YYABORT;
     }
 
   YYDPRINTF ((stderr, "Entering state %d\n", yystate));
@@ -1757,7 +1579,7 @@ yybackup:
 
   /* First try to decide what to do without reference to lookahead token.  */
   yyn = yypact[yystate];
-  if (yyn == YYPACT_NINF)
+  if (yypact_value_is_default (yyn))
     goto yydefault;
 
   /* Not known => get a lookahead token if don't already have one.  */
@@ -1766,7 +1588,7 @@ yybackup:
   if (yychar == YYEMPTY)
     {
       YYDPRINTF ((stderr, "Reading a token: "));
-      yychar = YYLEX;
+      yychar = yylex (&yylval);
     }
 
   if (yychar <= YYEOF)
@@ -1788,8 +1610,8 @@ yybackup:
   yyn = yytable[yyn];
   if (yyn <= 0)
     {
-      if (yyn == 0 || yyn == YYTABLE_NINF)
-	goto yyerrlab;
+      if (yytable_value_is_error (yyn))
+        goto yyerrlab;
       yyn = -yyn;
       goto yyreduce;
     }
@@ -1806,7 +1628,9 @@ yybackup:
   yychar = YYEMPTY;
 
   yystate = yyn;
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
   goto yynewstate;
 
@@ -1829,7 +1653,7 @@ yyreduce:
   yylen = yyr2[yyn];
 
   /* If YYLEN is nonzero, implement the default value of the action:
-     `$$ = $1'.
+     '$$ = $1'.
 
      Otherwise, the following line sets YYVAL to garbage.
      This behavior is undocumented and Bison
@@ -1843,391 +1667,353 @@ yyreduce:
   switch (yyn)
     {
         case 2:
-
-/* Line 1455 of yacc.c  */
-#line 115 "../Slice/Grammar.y"
+#line 116 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 1674 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 3:
-
-/* Line 1455 of yacc.c  */
-#line 123 "../Slice/Grammar.y"
+#line 124 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (3)]);
-;}
+    (yyval) = (yyvsp[-1]);
+}
+#line 1682 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 4:
-
-/* Line 1455 of yacc.c  */
-#line 132 "../Slice/Grammar.y"
+#line 133 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (3)]);
-;}
+    (yyval) = (yyvsp[-1]);
+}
+#line 1690 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 5:
-
-/* Line 1455 of yacc.c  */
-#line 136 "../Slice/Grammar.y"
+#line 137 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = new StringListTok;
-;}
+}
+#line 1698 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 6:
-
-/* Line 1455 of yacc.c  */
-#line 145 "../Slice/Grammar.y"
+#line 146 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[0]));
     if(!metaData->v.empty())
     {
         unit->addGlobalMetaData(metaData->v);
     }
-;}
+}
+#line 1710 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 8:
-
-/* Line 1455 of yacc.c  */
-#line 154 "../Slice/Grammar.y"
+#line 155 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-1]));
+    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[0]));
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+        contained->setMetaData(metaData->v);
     }
-;}
+}
+#line 1723 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 10:
-
-/* Line 1455 of yacc.c  */
-#line 164 "../Slice/Grammar.y"
+#line 165 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     yyerrok;
-;}
+}
+#line 1731 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 12:
-
-/* Line 1455 of yacc.c  */
-#line 169 "../Slice/Grammar.y"
+#line 170 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("`;' missing after definition");
-;}
+}
+#line 1739 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 13:
-
-/* Line 1455 of yacc.c  */
-#line 173 "../Slice/Grammar.y"
+#line 174 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 1746 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 14:
-
-/* Line 1455 of yacc.c  */
-#line 181 "../Slice/Grammar.y"
+#line 182 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || ModulePtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || ModulePtr::dynamicCast((yyvsp[0])));
+}
+#line 1754 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 15:
-
-/* Line 1455 of yacc.c  */
-#line 185 "../Slice/Grammar.y"
+#line 186 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[0])));
+}
+#line 1762 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 16:
-
-/* Line 1455 of yacc.c  */
-#line 189 "../Slice/Grammar.y"
+#line 190 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || ClassDefPtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || ClassDefPtr::dynamicCast((yyvsp[0])));
+}
+#line 1770 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 17:
-
-/* Line 1455 of yacc.c  */
-#line 193 "../Slice/Grammar.y"
+#line 194 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || ClassDeclPtr::dynamicCast((yyvsp[0])));
+}
+#line 1778 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 18:
-
-/* Line 1455 of yacc.c  */
-#line 197 "../Slice/Grammar.y"
+#line 198 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || ClassDefPtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || ClassDefPtr::dynamicCast((yyvsp[0])));
+}
+#line 1786 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 19:
-
-/* Line 1455 of yacc.c  */
-#line 201 "../Slice/Grammar.y"
+#line 202 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0);
-;}
+    assert((yyvsp[0]) == 0);
+}
+#line 1794 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 20:
-
-/* Line 1455 of yacc.c  */
-#line 205 "../Slice/Grammar.y"
+#line 206 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || ExceptionPtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || ExceptionPtr::dynamicCast((yyvsp[0])));
+}
+#line 1802 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 21:
-
-/* Line 1455 of yacc.c  */
-#line 209 "../Slice/Grammar.y"
+#line 210 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0);
-;}
+    assert((yyvsp[0]) == 0);
+}
+#line 1810 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 22:
-
-/* Line 1455 of yacc.c  */
-#line 213 "../Slice/Grammar.y"
+#line 214 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || StructPtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || StructPtr::dynamicCast((yyvsp[0])));
+}
+#line 1818 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 23:
-
-/* Line 1455 of yacc.c  */
-#line 217 "../Slice/Grammar.y"
+#line 218 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || SequencePtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || SequencePtr::dynamicCast((yyvsp[0])));
+}
+#line 1826 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 24:
-
-/* Line 1455 of yacc.c  */
-#line 221 "../Slice/Grammar.y"
+#line 222 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || DictionaryPtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || DictionaryPtr::dynamicCast((yyvsp[0])));
+}
+#line 1834 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 25:
-
-/* Line 1455 of yacc.c  */
-#line 225 "../Slice/Grammar.y"
+#line 226 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || EnumPtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || EnumPtr::dynamicCast((yyvsp[0])));
+}
+#line 1842 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 26:
-
-/* Line 1455 of yacc.c  */
-#line 229 "../Slice/Grammar.y"
+#line 230 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    assert((yyvsp[(1) - (1)]) == 0 || ConstPtr::dynamicCast((yyvsp[(1) - (1)])));
-;}
+    assert((yyvsp[0]) == 0 || ConstPtr::dynamicCast((yyvsp[0])));
+}
+#line 1850 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 27:
-
-/* Line 1455 of yacc.c  */
-#line 238 "../Slice/Grammar.y"
+#line 239 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->setSeenDefinition();
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     ModulePtr module = cont->createModule(ident->v);
     if(module)
     {
-	cont->checkIntroduced(ident->v, module);
-	unit->pushContainer(module);
-	(yyval) = module;
+        cont->checkIntroduced(ident->v, module);
+        unit->pushContainer(module);
+        (yyval) = module;
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 1871 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 28:
-
-/* Line 1455 of yacc.c  */
-#line 255 "../Slice/Grammar.y"
+#line 256 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    if((yyvsp[(3) - (6)]))
+    if((yyvsp[-3]))
     {
-	unit->popContainer();
-	(yyval) = (yyvsp[(3) - (6)]);
+        unit->popContainer();
+        (yyval) = (yyvsp[-3]);
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 1887 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 29:
-
-/* Line 1455 of yacc.c  */
-#line 272 "../Slice/Grammar.y"
+#line 273 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (2)]);
-;}
+    (yyval) = (yyvsp[0]);
+}
+#line 1895 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 30:
-
-/* Line 1455 of yacc.c  */
-#line 276 "../Slice/Grammar.y"
+#line 277 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     unit->error("keyword `" + ident->v + "' cannot be used as exception name");
-    (yyval) = (yyvsp[(2) - (2)]); // Dummy
-;}
+    (yyval) = (yyvsp[0]); // Dummy
+}
+#line 1905 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 31:
-
-/* Line 1455 of yacc.c  */
-#line 287 "../Slice/Grammar.y"
+#line 288 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("exceptions cannot be forward declared");
     (yyval) = 0;
-;}
+}
+#line 1914 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 32:
-
-/* Line 1455 of yacc.c  */
-#line 297 "../Slice/Grammar.y"
+#line 298 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (3)]));
-    ExceptionPtr base = ExceptionPtr::dynamicCast((yyvsp[(3) - (3)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-2]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-1]));
+    ExceptionPtr base = ExceptionPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     ExceptionPtr ex = cont->createException(ident->v, base, local->v);
     if(ex)
     {
-	cont->checkIntroduced(ident->v, ex);
-	unit->pushContainer(ex);
+        cont->checkIntroduced(ident->v, ex);
+        unit->pushContainer(ex);
     }
     (yyval) = ex;
-;}
+}
+#line 1932 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 33:
-
-/* Line 1455 of yacc.c  */
-#line 311 "../Slice/Grammar.y"
+#line 312 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    if((yyvsp[(4) - (7)]))
+    if((yyvsp[-3]))
     {
-	unit->popContainer();
+        unit->popContainer();
     }
-    (yyval) = (yyvsp[(4) - (7)]);
-;}
+    (yyval) = (yyvsp[-3]);
+}
+#line 1944 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 34:
-
-/* Line 1455 of yacc.c  */
-#line 324 "../Slice/Grammar.y"
+#line 325 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     ContainedPtr contained = cont->lookupException(scoped->v);
     cont->checkIntroduced(scoped->v);
     (yyval) = contained;
-;}
+}
+#line 1956 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 35:
-
-/* Line 1455 of yacc.c  */
-#line 332 "../Slice/Grammar.y"
+#line 333 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = 0;
-;}
+}
+#line 1964 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 36:
-
-/* Line 1455 of yacc.c  */
-#line 341 "../Slice/Grammar.y"
+#line 342 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
-    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
+    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2]));
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+        contained->setMetaData(metaData->v);
     }
-;}
+}
+#line 1977 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 37:
-
-/* Line 1455 of yacc.c  */
-#line 350 "../Slice/Grammar.y"
+#line 351 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 1984 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 38:
-
-/* Line 1455 of yacc.c  */
-#line 353 "../Slice/Grammar.y"
+#line 354 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("`;' missing after definition");
-;}
+}
+#line 1992 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 39:
-
-/* Line 1455 of yacc.c  */
-#line 357 "../Slice/Grammar.y"
+#line 358 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 1999 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 40:
-
-/* Line 1455 of yacc.c  */
-#line 365 "../Slice/Grammar.y"
+#line 366 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     TypeStringTokPtr typestring = new TypeStringTok;
     typestring->v = make_pair(type, ident->v);
     (yyval) = typestring;
-;}
+}
+#line 2011 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 41:
-
-/* Line 1455 of yacc.c  */
-#line 378 "../Slice/Grammar.y"
+#line 379 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    IntegerTokPtr i = IntegerTokPtr::dynamicCast((yyvsp[(2) - (3)]));
+    IntegerTokPtr i = IntegerTokPtr::dynamicCast((yyvsp[-1]));
 
     int tag;
     if(i->v < 0 || i->v > Int32Max)
@@ -2244,15 +2030,14 @@ yyreduce:
     m->v.optional = tag >= 0;
     m->v.tag = tag;
     (yyval) = m;
-;}
+}
+#line 2035 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 42:
-
-/* Line 1455 of yacc.c  */
-#line 398 "../Slice/Grammar.y"
+#line 399 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (3)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-1]));
 
     ContainerPtr cont = unit->currentContainer();
     assert(cont);
@@ -2305,106 +2090,98 @@ yyreduce:
     m->v.optional = tag >= 0;
     m->v.tag = tag;
     (yyval) = m;
-;}
+}
+#line 2095 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 43:
-
-/* Line 1455 of yacc.c  */
-#line 454 "../Slice/Grammar.y"
+#line 455 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("missing tag for optional");
     OptionalDefTokPtr m = new OptionalDefTok; // Dummy
     m->v.optional = false;
     m->v.tag = -1;
     (yyval) = m;
-;}
+}
+#line 2107 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 44:
-
-/* Line 1455 of yacc.c  */
-#line 462 "../Slice/Grammar.y"
+#line 463 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("missing tag for optional");
     OptionalDefTokPtr m = new OptionalDefTok; // Dummy
     m->v.optional = false;
     m->v.tag = -1;
     (yyval) = m;
-;}
+}
+#line 2119 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 45:
-
-/* Line 1455 of yacc.c  */
-#line 475 "../Slice/Grammar.y"
+#line 476 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[-1]));
+    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0]));
     m->v.type = ts->v.first;
     m->v.name = ts->v.second;
     (yyval) = m;
-;}
+}
+#line 2131 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 46:
-
-/* Line 1455 of yacc.c  */
-#line 483 "../Slice/Grammar.y"
+#line 484 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0]));
     OptionalDefTokPtr m = new OptionalDefTok;
     m->v.type = ts->v.first;
     m->v.name = ts->v.second;
     m->v.optional = false;
     m->v.tag = -1;
     (yyval) = m;
-;}
+}
+#line 2145 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 48:
-
-/* Line 1455 of yacc.c  */
-#line 504 "../Slice/Grammar.y"
+#line 505 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (2)]);
-;}
+    (yyval) = (yyvsp[0]);
+}
+#line 2153 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 49:
-
-/* Line 1455 of yacc.c  */
-#line 508 "../Slice/Grammar.y"
+#line 509 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     unit->error("keyword `" + ident->v + "' cannot be used as struct name");
-    (yyval) = (yyvsp[(2) - (2)]); // Dummy
-;}
+    (yyval) = (yyvsp[0]); // Dummy
+}
+#line 2163 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 50:
-
-/* Line 1455 of yacc.c  */
-#line 519 "../Slice/Grammar.y"
+#line 520 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("structs cannot be forward declared");
     (yyval) = 0; // Dummy
-;}
+}
+#line 2172 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 51:
-
-/* Line 1455 of yacc.c  */
-#line 529 "../Slice/Grammar.y"
+#line 530 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     StructPtr st = cont->createStruct(ident->v, local->v);
     if(st)
     {
-	cont->checkIntroduced(ident->v, st);
-	unit->pushContainer(st);
+        cont->checkIntroduced(ident->v, st);
+        unit->pushContainer(st);
     }
     else
     {
@@ -2413,19 +2190,18 @@ yyreduce:
         unit->pushContainer(st);
     }
     (yyval) = st;
-;}
+}
+#line 2195 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 52:
-
-/* Line 1455 of yacc.c  */
-#line 548 "../Slice/Grammar.y"
+#line 549 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    if((yyvsp[(3) - (6)]))
+    if((yyvsp[-3]))
     {
-	unit->popContainer();
+        unit->popContainer();
     }
-    (yyval) = (yyvsp[(3) - (6)]);
+    (yyval) = (yyvsp[-3]);
 
     //
     // Empty structures are not allowed
@@ -2434,76 +2210,69 @@ yyreduce:
     assert(st);
     if(st->dataMembers().empty())
     {
-    	unit->error("struct `" + st->name() + "' must have at least one member"); // $$ is a dummy
+        unit->error("struct `" + st->name() + "' must have at least one member"); // $$ is a dummy
     }
-;}
+}
+#line 2217 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 53:
-
-/* Line 1455 of yacc.c  */
-#line 571 "../Slice/Grammar.y"
+#line 572 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
-    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
+    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2]));
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+        contained->setMetaData(metaData->v);
     }
-;}
+}
+#line 2230 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 54:
-
-/* Line 1455 of yacc.c  */
-#line 580 "../Slice/Grammar.y"
+#line 581 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 2237 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 55:
-
-/* Line 1455 of yacc.c  */
-#line 583 "../Slice/Grammar.y"
+#line 584 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("`;' missing after definition");
-;}
+}
+#line 2245 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 56:
-
-/* Line 1455 of yacc.c  */
-#line 587 "../Slice/Grammar.y"
+#line 588 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 2252 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 58:
-
-/* Line 1455 of yacc.c  */
-#line 601 "../Slice/Grammar.y"
+#line 602 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (2)]);
-;}
+    (yyval) = (yyvsp[0]);
+}
+#line 2260 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 59:
-
-/* Line 1455 of yacc.c  */
-#line 605 "../Slice/Grammar.y"
+#line 606 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     unit->error("keyword `" + ident->v + "' cannot be used as class name");
-    (yyval) = (yyvsp[(2) - (2)]); // Dummy
-;}
+    (yyval) = (yyvsp[0]); // Dummy
+}
+#line 2270 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 60:
-
-/* Line 1455 of yacc.c  */
-#line 616 "../Slice/Grammar.y"
+#line 617 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    IceUtil::Int64 id = IntegerTokPtr::dynamicCast((yyvsp[(3) - (4)]))->v;
+    IceUtil::Int64 id = IntegerTokPtr::dynamicCast((yyvsp[-1]))->v;
     if(id < 0)
     {
         unit->error("invalid compact id for class: id must be a positive integer");
@@ -2522,18 +2291,17 @@ yyreduce:
     }
 
     ClassIdTokPtr classId = new ClassIdTok();
-    classId->v = StringTokPtr::dynamicCast((yyvsp[(2) - (4)]))->v;
+    classId->v = StringTokPtr::dynamicCast((yyvsp[-2]))->v;
     classId->t = static_cast<int>(id);
     (yyval) = classId;
-;}
+}
+#line 2299 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 61:
-
-/* Line 1455 of yacc.c  */
-#line 641 "../Slice/Grammar.y"
+#line 642 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(3) - (4)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-1]));
 
     ContainerPtr cont = unit->currentContainer();
     assert(cont);
@@ -2591,194 +2359,181 @@ yyreduce:
     }
 
     ClassIdTokPtr classId = new ClassIdTok();
-    classId->v = StringTokPtr::dynamicCast((yyvsp[(2) - (4)]))->v;
+    classId->v = StringTokPtr::dynamicCast((yyvsp[-2]))->v;
     classId->t = id;
     (yyval) = classId;
 
-;}
+}
+#line 2368 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 62:
-
-/* Line 1455 of yacc.c  */
-#line 706 "../Slice/Grammar.y"
+#line 707 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     ClassIdTokPtr classId = new ClassIdTok();
-    classId->v = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]))->v;
+    classId->v = StringTokPtr::dynamicCast((yyvsp[0]))->v;
     classId->t = -1;
     (yyval) = classId;
-;}
+}
+#line 2379 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 63:
-
-/* Line 1455 of yacc.c  */
-#line 718 "../Slice/Grammar.y"
+#line 719 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     ClassDeclPtr cl = cont->createClassDecl(ident->v, false, local->v);
     (yyval) = cl;
-;}
+}
+#line 2391 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 64:
-
-/* Line 1455 of yacc.c  */
-#line 731 "../Slice/Grammar.y"
+#line 732 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (4)]));
-    ClassIdTokPtr ident = ClassIdTokPtr::dynamicCast((yyvsp[(2) - (4)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-3]));
+    ClassIdTokPtr ident = ClassIdTokPtr::dynamicCast((yyvsp[-2]));
     ContainerPtr cont = unit->currentContainer();
-    ClassDefPtr base = ClassDefPtr::dynamicCast((yyvsp[(3) - (4)]));
-    ClassListTokPtr bases = ClassListTokPtr::dynamicCast((yyvsp[(4) - (4)]));
+    ClassDefPtr base = ClassDefPtr::dynamicCast((yyvsp[-1]));
+    ClassListTokPtr bases = ClassListTokPtr::dynamicCast((yyvsp[0]));
     if(base)
     {
-	bases->v.push_front(base);
+    bases->v.push_front(base);
     }
     ClassDefPtr cl = cont->createClassDef(ident->v, ident->t, false, bases->v, local->v);
     if(cl)
     {
-	cont->checkIntroduced(ident->v, cl);
-	unit->pushContainer(cl);
-	(yyval) = cl;
+        cont->checkIntroduced(ident->v, cl);
+        unit->pushContainer(cl);
+        (yyval) = cl;
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 2418 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 65:
-
-/* Line 1455 of yacc.c  */
-#line 754 "../Slice/Grammar.y"
+#line 755 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    if((yyvsp[(5) - (8)]))
+    if((yyvsp[-3]))
     {
-	unit->popContainer();
-	(yyval) = (yyvsp[(5) - (8)]);
+        unit->popContainer();
+        (yyval) = (yyvsp[-3]);
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 2434 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 66:
-
-/* Line 1455 of yacc.c  */
-#line 771 "../Slice/Grammar.y"
+#line 772 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     TypeList types = cont->lookupType(scoped->v);
     (yyval) = 0;
     if(!types.empty())
     {
-	ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
-	if(!cl || cl->isInterface())
-	{
-	    string msg = "`";
-	    msg += scoped->v;
-	    msg += "' is not a class";
-	    unit->error(msg);
-	}
-	else
-	{
-	    ClassDefPtr def = cl->definition();
-	    if(!def)
-	    {
-		string msg = "`";
-		msg += scoped->v;
-		msg += "' has been declared but not defined";
-		unit->error(msg);
-	    }
-	    else
-	    {
-	    	cont->checkIntroduced(scoped->v);
-		(yyval) = def;
-	    }
-	}
+        ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
+        if(!cl || cl->isInterface())
+        {
+            string msg = "`";
+            msg += scoped->v;
+            msg += "' is not a class";
+            unit->error(msg);
+        }
+        else
+        {
+            ClassDefPtr def = cl->definition();
+            if(!def)
+            {
+                string msg = "`";
+                msg += scoped->v;
+                msg += "' has been declared but not defined";
+                unit->error(msg);
+            }
+            else
+            {
+                cont->checkIntroduced(scoped->v);
+                (yyval) = def;
+            }
+        }
     }
-;}
+}
+#line 2472 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 67:
-
-/* Line 1455 of yacc.c  */
-#line 805 "../Slice/Grammar.y"
+#line 806 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = 0;
-;}
+}
+#line 2480 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 68:
-
-/* Line 1455 of yacc.c  */
-#line 814 "../Slice/Grammar.y"
+#line 815 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (2)]);
-;}
+    (yyval) = (yyvsp[0]);
+}
+#line 2488 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 69:
-
-/* Line 1455 of yacc.c  */
-#line 818 "../Slice/Grammar.y"
+#line 819 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = new ClassListTok;
-;}
+}
+#line 2496 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 70:
-
-/* Line 1455 of yacc.c  */
-#line 827 "../Slice/Grammar.y"
+#line 828 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
-    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
+    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2]));
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+        contained->setMetaData(metaData->v);
     }
-;}
+}
+#line 2509 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 71:
-
-/* Line 1455 of yacc.c  */
-#line 836 "../Slice/Grammar.y"
+#line 837 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 2516 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 72:
-
-/* Line 1455 of yacc.c  */
-#line 839 "../Slice/Grammar.y"
+#line 840 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("`;' missing after definition");
-;}
+}
+#line 2524 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 73:
-
-/* Line 1455 of yacc.c  */
-#line 843 "../Slice/Grammar.y"
+#line 844 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 2531 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 74:
-
-/* Line 1455 of yacc.c  */
-#line 851 "../Slice/Grammar.y"
+#line 852 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[0]));
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     DataMemberPtr dm;
     if(cl)
@@ -2797,16 +2552,15 @@ yyreduce:
     }
     unit->currentContainer()->checkIntroduced(def->v.name, dm);
     (yyval) = dm;
-;}
+}
+#line 2557 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 75:
-
-/* Line 1455 of yacc.c  */
-#line 873 "../Slice/Grammar.y"
+#line 874 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(3) - (3)]));
+    OptionalDefTokPtr def = OptionalDefTokPtr::dynamicCast((yyvsp[-2]));
+    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[0]));
 
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     DataMemberPtr dm;
@@ -2829,16 +2583,15 @@ yyreduce:
     }
     unit->currentContainer()->checkIntroduced(def->v.name, dm);
     (yyval) = dm;
-;}
+}
+#line 2588 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 76:
-
-/* Line 1455 of yacc.c  */
-#line 900 "../Slice/Grammar.y"
+#line 901 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
-    string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
+    TypePtr type = TypePtr::dynamicCast((yyvsp[-1]));
+    string name = StringTokPtr::dynamicCast((yyvsp[0]))->v;
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
@@ -2856,15 +2609,14 @@ yyreduce:
     }
     assert((yyval));
     unit->error("keyword `" + name + "' cannot be used as data member name");
-;}
+}
+#line 2614 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 77:
-
-/* Line 1455 of yacc.c  */
-#line 922 "../Slice/Grammar.y"
+#line 923 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (1)]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[0]));
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
@@ -2882,758 +2634,719 @@ yyreduce:
     }
     assert((yyval));
     unit->error("missing data member name");
-;}
+}
+#line 2639 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 78:
-
-/* Line 1455 of yacc.c  */
-#line 948 "../Slice/Grammar.y"
+#line 949 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
     assert(st);
     DataMemberPtr dm = st->createDataMember(ts->v.second, ts->v.first, false, -1, 0, "", "");
     unit->currentContainer()->checkIntroduced(ts->v.second, dm);
     (yyval) = dm;
-;}
+}
+#line 2652 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 79:
-
-/* Line 1455 of yacc.c  */
-#line 957 "../Slice/Grammar.y"
+#line 958 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(3) - (3)]));
+    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[-2]));
+    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[0]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
     assert(st);
     DataMemberPtr dm = st->createDataMember(ts->v.second, ts->v.first, false, -1, value->v.value,
                                             value->v.valueAsString, value->v.valueAsLiteral);
     unit->currentContainer()->checkIntroduced(ts->v.second, dm);
     (yyval) = dm;
-;}
+}
+#line 2667 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 80:
-
-/* Line 1455 of yacc.c  */
-#line 968 "../Slice/Grammar.y"
+#line 969 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[0]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
     assert(st);
     (yyval) = st->createDataMember(ts->v.second, ts->v.first, false, 0, 0, "", ""); // Dummy
     assert((yyval));
     unit->error("optional data members not supported in struct");
-;}
+}
+#line 2680 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 81:
-
-/* Line 1455 of yacc.c  */
-#line 977 "../Slice/Grammar.y"
+#line 978 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[(2) - (4)]));
+    TypeStringTokPtr ts = TypeStringTokPtr::dynamicCast((yyvsp[-2]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
     assert(st);
     (yyval) = st->createDataMember(ts->v.second, ts->v.first, false, 0, 0, "", ""); // Dummy
     assert((yyval));
     unit->error("optional data members not supported in struct");
-;}
+}
+#line 2693 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 82:
-
-/* Line 1455 of yacc.c  */
-#line 986 "../Slice/Grammar.y"
+#line 987 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (2)]));
-    string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
+    TypePtr type = TypePtr::dynamicCast((yyvsp[-1]));
+    string name = StringTokPtr::dynamicCast((yyvsp[0]))->v;
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
     assert(st);
     (yyval) = st->createDataMember(name, type, false, 0, 0, "", ""); // Dummy
     assert((yyval));
     unit->error("keyword `" + name + "' cannot be used as data member name");
-;}
+}
+#line 2707 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 83:
-
-/* Line 1455 of yacc.c  */
-#line 996 "../Slice/Grammar.y"
+#line 997 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(1) - (1)]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[0]));
     StructPtr st = StructPtr::dynamicCast(unit->currentContainer());
     assert(st);
     (yyval) = st->createDataMember(IceUtil::generateUUID(), type, false, 0, 0, "", ""); // Dummy
     assert((yyval));
     unit->error("missing data member name");
-;}
+}
+#line 2720 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 84:
-
-/* Line 1455 of yacc.c  */
-#line 1010 "../Slice/Grammar.y"
+#line 1011 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    m->v.type = TypePtr::dynamicCast((yyvsp[(2) - (2)]));
+    OptionalDefTokPtr m = OptionalDefTokPtr::dynamicCast((yyvsp[-1]));
+    m->v.type = TypePtr::dynamicCast((yyvsp[0]));
     (yyval) = m;
-;}
+}
+#line 2730 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 85:
-
-/* Line 1455 of yacc.c  */
-#line 1016 "../Slice/Grammar.y"
+#line 1017 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     OptionalDefTokPtr m = new OptionalDefTok();
-    m->v.type = TypePtr::dynamicCast((yyvsp[(1) - (1)]));
+    m->v.type = TypePtr::dynamicCast((yyvsp[0]));
     m->v.optional = false;
     m->v.tag = -1;
     (yyval) = m;
-;}
+}
+#line 2742 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 86:
-
-/* Line 1455 of yacc.c  */
-#line 1024 "../Slice/Grammar.y"
+#line 1025 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     OptionalDefTokPtr m = new OptionalDefTok;
     m->v.optional = false;
     m->v.tag = -1;
     (yyval) = m;
-;}
+}
+#line 2753 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 87:
-
-/* Line 1455 of yacc.c  */
-#line 1036 "../Slice/Grammar.y"
+#line 1037 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
+    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1]));
+    string name = StringTokPtr::dynamicCast((yyvsp[0]))->v;
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
-	OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag);
-	if(op)
-	{
-	    cl->checkIntroduced(name, op);
-	    unit->pushContainer(op);
-	    (yyval) = op;
-	}
-	else
-	{
-	    (yyval) = 0;
-	}
+        OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag);
+        if(op)
+        {
+            cl->checkIntroduced(name, op);
+            unit->pushContainer(op);
+            (yyval) = op;
+        }
+        else
+        {
+            (yyval) = 0;
+        }
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 2781 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 88:
-
-/* Line 1455 of yacc.c  */
-#line 1060 "../Slice/Grammar.y"
+#line 1061 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(2) - (3)]));
-    string name = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]))->v;
+    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1]));
+    string name = StringTokPtr::dynamicCast((yyvsp[0]))->v;
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
-	OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag,
-                                              Operation::Idempotent);
-	if(op)
-	{
-	    cl->checkIntroduced(name, op);
-	    unit->pushContainer(op);
-	    (yyval) = op;
-	}
-	else
-	{
-	    (yyval) = 0;
-	}
+        OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag,
+                                                Operation::Idempotent);
+        if(op)
+        {
+            cl->checkIntroduced(name, op);
+            unit->pushContainer(op);
+            (yyval) = op;
+        }
+        else
+        {
+            (yyval) = 0;
+        }
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 2810 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 89:
-
-/* Line 1455 of yacc.c  */
-#line 1085 "../Slice/Grammar.y"
+#line 1086 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    string name = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]))->v;
+    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1]));
+    string name = StringTokPtr::dynamicCast((yyvsp[0]))->v;
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
-	OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag);
-	if(op)
-	{
-	    unit->pushContainer(op);
-	    unit->error("keyword `" + name + "' cannot be used as operation name");
-	    (yyval) = op; // Dummy
-	}
-	else
-	{
-	    (yyval) = 0;
-	}
+        OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag);
+        if(op)
+        {
+            unit->pushContainer(op);
+            unit->error("keyword `" + name + "' cannot be used as operation name");
+            (yyval) = op; // Dummy
+        }
+        else
+        {
+            (yyval) = 0;
+        }
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 2838 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 90:
-
-/* Line 1455 of yacc.c  */
-#line 1109 "../Slice/Grammar.y"
+#line 1110 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[(2) - (3)]));
-    string name = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]))->v;
+    OptionalDefTokPtr returnType = OptionalDefTokPtr::dynamicCast((yyvsp[-1]));
+    string name = StringTokPtr::dynamicCast((yyvsp[0]))->v;
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
-	OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag,
-                                              Operation::Idempotent);
-	if(op)
-	{
-	    unit->pushContainer(op);
-	    unit->error("keyword `" + name + "' cannot be used as operation name");
-	    (yyval) = op; // Dummy
-	}
-	else
-	{
-	    return 0;
-	}
+        OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag,
+                                                Operation::Idempotent);
+        if(op)
+        {
+            unit->pushContainer(op);
+            unit->error("keyword `" + name + "' cannot be used as operation name");
+            (yyval) = op; // Dummy
+        }
+        else
+        {
+            return 0;
+        }
     }
     else
     {
-    	(yyval) = 0;
+        (yyval) = 0;
     }
-;}
+}
+#line 2867 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 91:
-
-/* Line 1455 of yacc.c  */
-#line 1139 "../Slice/Grammar.y"
+#line 1140 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    if((yyvsp[(1) - (3)]))
+    if((yyvsp[-2]))
     {
-	unit->popContainer();
-	(yyval) = (yyvsp[(1) - (3)]);
+        unit->popContainer();
+        (yyval) = (yyvsp[-2]);
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 2883 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 92:
-
-/* Line 1455 of yacc.c  */
-#line 1151 "../Slice/Grammar.y"
+#line 1152 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OperationPtr op = OperationPtr::dynamicCast((yyvsp[(4) - (5)]));
-    ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[(5) - (5)]));
+    OperationPtr op = OperationPtr::dynamicCast((yyvsp[-1]));
+    ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[0]));
     assert(el);
     if(op)
     {
         op->setExceptionList(el->v);
     }
-;}
+}
+#line 2897 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 93:
-
-/* Line 1455 of yacc.c  */
-#line 1161 "../Slice/Grammar.y"
+#line 1162 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    if((yyvsp[(1) - (3)]))
+    if((yyvsp[-2]))
     {
-	unit->popContainer();
+        unit->popContainer();
     }
     yyerrok;
-;}
+}
+#line 2909 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 94:
-
-/* Line 1455 of yacc.c  */
-#line 1169 "../Slice/Grammar.y"
+#line 1170 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    OperationPtr op = OperationPtr::dynamicCast((yyvsp[(4) - (5)]));
-    ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[(5) - (5)]));
+    OperationPtr op = OperationPtr::dynamicCast((yyvsp[-1]));
+    ExceptionListTokPtr el = ExceptionListTokPtr::dynamicCast((yyvsp[0]));
     assert(el);
     if(op)
     {
         op->setExceptionList(el->v); // Dummy
     }
-;}
+}
+#line 2923 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 97:
-
-/* Line 1455 of yacc.c  */
-#line 1191 "../Slice/Grammar.y"
+#line 1192 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (2)]);
-;}
+    (yyval) = (yyvsp[0]);
+}
+#line 2931 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 98:
-
-/* Line 1455 of yacc.c  */
-#line 1195 "../Slice/Grammar.y"
+#line 1196 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     unit->error("keyword `" + ident->v + "' cannot be used as interface name");
-    (yyval) = (yyvsp[(2) - (2)]); // Dummy
-;}
+    (yyval) = (yyvsp[0]); // Dummy
+}
+#line 2941 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 99:
-
-/* Line 1455 of yacc.c  */
-#line 1206 "../Slice/Grammar.y"
+#line 1207 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     ClassDeclPtr cl = cont->createClassDecl(ident->v, true, local->v);
     cont->checkIntroduced(ident->v, cl);
     (yyval) = cl;
-;}
+}
+#line 2954 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 100:
-
-/* Line 1455 of yacc.c  */
-#line 1220 "../Slice/Grammar.y"
+#line 1221 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (3)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-2]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-1]));
     ContainerPtr cont = unit->currentContainer();
-    ClassListTokPtr bases = ClassListTokPtr::dynamicCast((yyvsp[(3) - (3)]));
+    ClassListTokPtr bases = ClassListTokPtr::dynamicCast((yyvsp[0]));
     ClassDefPtr cl = cont->createClassDef(ident->v, -1, true, bases->v, local->v);
     if(cl)
     {
-	cont->checkIntroduced(ident->v, cl);
-	unit->pushContainer(cl);
-	(yyval) = cl;
+    cont->checkIntroduced(ident->v, cl);
+    unit->pushContainer(cl);
+    (yyval) = cl;
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 2976 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 101:
-
-/* Line 1455 of yacc.c  */
-#line 1238 "../Slice/Grammar.y"
+#line 1239 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    if((yyvsp[(4) - (7)]))
+    if((yyvsp[-3]))
     {
-	unit->popContainer();
-	(yyval) = (yyvsp[(4) - (7)]);
+    unit->popContainer();
+    (yyval) = (yyvsp[-3]);
     }
     else
     {
-	(yyval) = 0;
+    (yyval) = 0;
     }
-;}
+}
+#line 2992 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 102:
-
-/* Line 1455 of yacc.c  */
-#line 1255 "../Slice/Grammar.y"
+#line 1256 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    ClassListTokPtr intfs = ClassListTokPtr::dynamicCast((yyvsp[(3) - (3)]));
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
+    ClassListTokPtr intfs = ClassListTokPtr::dynamicCast((yyvsp[0]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-2]));
     ContainerPtr cont = unit->currentContainer();
     TypeList types = cont->lookupType(scoped->v);
     if(!types.empty())
     {
-	ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
-	if(!cl || !cl->isInterface())
-	{
-	    string msg = "`";
-	    msg += scoped->v;
-	    msg += "' is not an interface";
-	    unit->error(msg);
-	}
-	else
-	{
-	    ClassDefPtr def = cl->definition();
-	    if(!def)
-	    {
-		string msg = "`";
-		msg += scoped->v;
-		msg += "' has been declared but not defined";
-		unit->error(msg);
-	    }
-	    else
-	    {
-	    	cont->checkIntroduced(scoped->v);
-		intfs->v.push_front(def);
-	    }
-	}
+    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
+    if(!cl || !cl->isInterface())
+    {
+        string msg = "`";
+        msg += scoped->v;
+        msg += "' is not an interface";
+        unit->error(msg);
+    }
+    else
+    {
+        ClassDefPtr def = cl->definition();
+        if(!def)
+        {
+        string msg = "`";
+        msg += scoped->v;
+        msg += "' has been declared but not defined";
+        unit->error(msg);
+        }
+        else
+        {
+            cont->checkIntroduced(scoped->v);
+        intfs->v.push_front(def);
+        }
+    }
     }
     (yyval) = intfs;
-;}
+}
+#line 3031 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 103:
-
-/* Line 1455 of yacc.c  */
-#line 1290 "../Slice/Grammar.y"
+#line 1291 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     ClassListTokPtr intfs = new ClassListTok;
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     TypeList types = cont->lookupType(scoped->v);
     if(!types.empty())
     {
-	ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
-	if(!cl || !cl->isInterface())
-	{
-	    string msg = "`";
-	    msg += scoped->v;
-	    msg += "' is not an interface";
-	    unit->error(msg); // $$ is a dummy
-	}
-	else
-	{
-	    ClassDefPtr def = cl->definition();
-	    if(!def)
-	    {
-		string msg = "`";
-		msg += scoped->v;
-		msg += "' has been declared but not defined";
-		unit->error(msg); // $$ is a dummy
-	    }
-	    else
-	    {
-	    	cont->checkIntroduced(scoped->v);
-		intfs->v.push_front(def);
-	    }
-	}
+    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
+    if(!cl || !cl->isInterface())
+    {
+        string msg = "`";
+        msg += scoped->v;
+        msg += "' is not an interface";
+        unit->error(msg); // $$ is a dummy
+    }
+    else
+    {
+        ClassDefPtr def = cl->definition();
+        if(!def)
+        {
+        string msg = "`";
+        msg += scoped->v;
+        msg += "' has been declared but not defined";
+        unit->error(msg); // $$ is a dummy
+        }
+        else
+        {
+            cont->checkIntroduced(scoped->v);
+        intfs->v.push_front(def);
+        }
+    }
     }
     (yyval) = intfs;
-;}
+}
+#line 3070 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 104:
-
-/* Line 1455 of yacc.c  */
-#line 1325 "../Slice/Grammar.y"
+#line 1326 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("illegal inheritance from type Object");
     (yyval) = new ClassListTok; // Dummy
-;}
+}
+#line 3079 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 105:
-
-/* Line 1455 of yacc.c  */
-#line 1335 "../Slice/Grammar.y"
+#line 1331 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (2)]);
-;}
+    unit->error("illegal inheritance from type Value");
+    (yyval) = new ClassListTok; // Dummy
+}
+#line 3088 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 106:
-
-/* Line 1455 of yacc.c  */
-#line 1339 "../Slice/Grammar.y"
+#line 1341 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = new ClassListTok;
-;}
+    (yyval) = (yyvsp[0]);
+}
+#line 3096 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 107:
+#line 1345 "../Slice/Grammar.y" /* yacc.c:1646  */
+    {
+    (yyval) = new ClassListTok;
+}
+#line 3104 "Grammar.tab.c" /* yacc.c:1646  */
+    break;
 
-/* Line 1455 of yacc.c  */
-#line 1348 "../Slice/Grammar.y"
+  case 108:
+#line 1354 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(1) - (4)]));
-    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[(2) - (4)]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
+    ContainedPtr contained = ContainedPtr::dynamicCast((yyvsp[-2]));
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+    contained->setMetaData(metaData->v);
     }
-;}
+}
+#line 3117 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 108:
-
-/* Line 1455 of yacc.c  */
-#line 1357 "../Slice/Grammar.y"
+  case 109:
+#line 1363 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 3124 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 109:
-
-/* Line 1455 of yacc.c  */
-#line 1360 "../Slice/Grammar.y"
+  case 110:
+#line 1366 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("`;' missing after definition");
-;}
+}
+#line 3132 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 110:
-
-/* Line 1455 of yacc.c  */
-#line 1364 "../Slice/Grammar.y"
+  case 111:
+#line 1370 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 3139 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 112:
-
-/* Line 1455 of yacc.c  */
-#line 1378 "../Slice/Grammar.y"
+  case 113:
+#line 1384 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[(1) - (3)]));
-    ExceptionListTokPtr exceptionList = ExceptionListTokPtr::dynamicCast((yyvsp[(3) - (3)]));
+    ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[-2]));
+    ExceptionListTokPtr exceptionList = ExceptionListTokPtr::dynamicCast((yyvsp[0]));
     exceptionList->v.push_front(exception);
     (yyval) = exceptionList;
-;}
+}
+#line 3150 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 113:
-
-/* Line 1455 of yacc.c  */
-#line 1385 "../Slice/Grammar.y"
+  case 114:
+#line 1391 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[(1) - (1)]));
+    ExceptionPtr exception = ExceptionPtr::dynamicCast((yyvsp[0]));
     ExceptionListTokPtr exceptionList = new ExceptionListTok;
     exceptionList->v.push_front(exception);
     (yyval) = exceptionList;
-;}
+}
+#line 3161 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 114:
-
-/* Line 1455 of yacc.c  */
-#line 1397 "../Slice/Grammar.y"
+  case 115:
+#line 1403 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     ExceptionPtr exception = cont->lookupException(scoped->v);
     if(!exception)
     {
-	exception = cont->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy
+    exception = cont->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy
     }
     cont->checkIntroduced(scoped->v, exception);
     (yyval) = exception;
-;}
+}
+#line 3177 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 115:
-
-/* Line 1455 of yacc.c  */
-#line 1409 "../Slice/Grammar.y"
+  case 116:
+#line 1415 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     unit->error("keyword `" + ident->v + "' cannot be used as exception name");
     (yyval) = unit->currentContainer()->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy
-;}
+}
+#line 3187 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 116:
-
-/* Line 1455 of yacc.c  */
-#line 1420 "../Slice/Grammar.y"
+  case 117:
+#line 1426 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (7)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(7) - (7)]));
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (7)]));
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (7)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-6]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[-2]));
     ContainerPtr cont = unit->currentContainer();
     (yyval) = cont->createSequence(ident->v, type, metaData->v, local->v);
-;}
+}
+#line 3200 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 117:
-
-/* Line 1455 of yacc.c  */
-#line 1429 "../Slice/Grammar.y"
+  case 118:
+#line 1435 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (7)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(7) - (7)]));
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (7)]));
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (7)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-6]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[-2]));
     ContainerPtr cont = unit->currentContainer();
     (yyval) = cont->createSequence(ident->v, type, metaData->v, local->v); // Dummy
     unit->error("keyword `" + ident->v + "' cannot be used as sequence name");
-;}
+}
+#line 3214 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 118:
-
-/* Line 1455 of yacc.c  */
-#line 1444 "../Slice/Grammar.y"
-    {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (10)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(10) - (10)]));
-    StringListTokPtr keyMetaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (10)]));
-    TypePtr keyType = TypePtr::dynamicCast((yyvsp[(5) - (10)]));
-    StringListTokPtr valueMetaData = StringListTokPtr::dynamicCast((yyvsp[(7) - (10)]));
-    TypePtr valueType = TypePtr::dynamicCast((yyvsp[(8) - (10)]));
+  case 119:
+#line 1450 "../Slice/Grammar.y" /* yacc.c:1646  */
+    {
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-9]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringListTokPtr keyMetaData = StringListTokPtr::dynamicCast((yyvsp[-6]));
+    TypePtr keyType = TypePtr::dynamicCast((yyvsp[-5]));
+    StringListTokPtr valueMetaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
+    TypePtr valueType = TypePtr::dynamicCast((yyvsp[-2]));
     ContainerPtr cont = unit->currentContainer();
     (yyval) = cont->createDictionary(ident->v, keyType, keyMetaData->v, valueType, valueMetaData->v, local->v);
-;}
+}
+#line 3229 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 119:
-
-/* Line 1455 of yacc.c  */
-#line 1455 "../Slice/Grammar.y"
-    {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (10)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(10) - (10)]));
-    StringListTokPtr keyMetaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (10)]));
-    TypePtr keyType = TypePtr::dynamicCast((yyvsp[(5) - (10)]));
-    StringListTokPtr valueMetaData = StringListTokPtr::dynamicCast((yyvsp[(7) - (10)]));
-    TypePtr valueType = TypePtr::dynamicCast((yyvsp[(8) - (10)]));
+  case 120:
+#line 1461 "../Slice/Grammar.y" /* yacc.c:1646  */
+    {
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-9]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringListTokPtr keyMetaData = StringListTokPtr::dynamicCast((yyvsp[-6]));
+    TypePtr keyType = TypePtr::dynamicCast((yyvsp[-5]));
+    StringListTokPtr valueMetaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
+    TypePtr valueType = TypePtr::dynamicCast((yyvsp[-2]));
     ContainerPtr cont = unit->currentContainer();
     (yyval) = cont->createDictionary(ident->v, keyType, keyMetaData->v, valueType, valueMetaData->v, local->v); // Dummy
     unit->error("keyword `" + ident->v + "' cannot be used as dictionary name");
-;}
+}
+#line 3245 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 120:
-
-/* Line 1455 of yacc.c  */
-#line 1472 "../Slice/Grammar.y"
+  case 121:
+#line 1478 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (2)]);
-;}
+    (yyval) = (yyvsp[0]);
+}
+#line 3253 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 121:
-
-/* Line 1455 of yacc.c  */
-#line 1476 "../Slice/Grammar.y"
+  case 122:
+#line 1482 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     unit->error("keyword `" + ident->v + "' cannot be used as enumeration name");
-    (yyval) = (yyvsp[(2) - (2)]); // Dummy
-;}
+    (yyval) = (yyvsp[0]); // Dummy
+}
+#line 3263 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 122:
-
-/* Line 1455 of yacc.c  */
-#line 1487 "../Slice/Grammar.y"
+  case 123:
+#line 1493 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     EnumPtr en = cont->createEnum(ident->v, local->v);
     cont->checkIntroduced(ident->v, en);
     (yyval) = en;
-;}
+}
+#line 3276 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 123:
-
-/* Line 1455 of yacc.c  */
-#line 1496 "../Slice/Grammar.y"
+  case 124:
+#line 1502 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    EnumPtr en = EnumPtr::dynamicCast((yyvsp[(3) - (6)]));
+    EnumPtr en = EnumPtr::dynamicCast((yyvsp[-3]));
     if(en)
     {
-	EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[(5) - (6)]));
-	if(enumerators->v.empty())
-	{
-	    unit->error("enum `" + en->name() + "' must have at least one enumerator");
-	}
-	en->setEnumerators(enumerators->v); // Dummy
+    EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[-1]));
+    if(enumerators->v.empty())
+    {
+        unit->error("enum `" + en->name() + "' must have at least one enumerator");
     }
-    (yyval) = (yyvsp[(3) - (6)]);
-;}
+    en->setEnumerators(enumerators->v); // Dummy
+    }
+    (yyval) = (yyvsp[-3]);
+}
+#line 3294 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 124:
-
-/* Line 1455 of yacc.c  */
-#line 1511 "../Slice/Grammar.y"
+  case 125:
+#line 1517 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     unit->error("missing enumeration name");
-    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[(1) - (5)]));
+    BoolTokPtr local = BoolTokPtr::dynamicCast((yyvsp[-4]));
     ContainerPtr cont = unit->currentContainer();
     EnumPtr en = cont->createEnum(IceUtil::generateUUID(), local->v, Dummy); // Dummy
-    EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[(4) - (5)]));
+    EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast((yyvsp[-1]));
     en->setEnumerators(enumerators->v); // Dummy
     (yyval) = en;
-;}
+}
+#line 3308 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 125:
-
-/* Line 1455 of yacc.c  */
-#line 1526 "../Slice/Grammar.y"
+  case 126:
+#line 1532 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    EnumeratorListTokPtr ens = EnumeratorListTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    ens->v.splice(ens->v.end(), EnumeratorListTokPtr::dynamicCast((yyvsp[(3) - (3)]))->v);
+    EnumeratorListTokPtr ens = EnumeratorListTokPtr::dynamicCast((yyvsp[-2]));
+    ens->v.splice(ens->v.end(), EnumeratorListTokPtr::dynamicCast((yyvsp[0]))->v);
     (yyval) = ens;
-;}
+}
+#line 3318 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 126:
-
-/* Line 1455 of yacc.c  */
-#line 1532 "../Slice/Grammar.y"
+  case 127:
+#line 1538 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 3325 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 127:
-
-/* Line 1455 of yacc.c  */
-#line 1540 "../Slice/Grammar.y"
+  case 128:
+#line 1546 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     EnumeratorListTokPtr ens = new EnumeratorListTok;
     ContainerPtr cont = unit->currentContainer();
     EnumeratorPtr en = cont->createEnumerator(ident->v);
     if(en)
     {
-	ens->v.push_front(en);
+    ens->v.push_front(en);
     }
     (yyval) = ens;
-;}
+}
+#line 3341 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 128:
-
-/* Line 1455 of yacc.c  */
-#line 1552 "../Slice/Grammar.y"
+  case 129:
+#line 1558 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-2]));
     EnumeratorListTokPtr ens = new EnumeratorListTok;
     ContainerPtr cont = unit->currentContainer();
-    IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[(3) - (3)]));
+    IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[0]));
     if(intVal)
     {
         if(intVal->v < 0 || intVal->v > Int32Max)
@@ -3650,46 +3363,42 @@ yyreduce:
         }
     }
     (yyval) = ens;
-;}
+}
+#line 3368 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 129:
-
-/* Line 1455 of yacc.c  */
-#line 1575 "../Slice/Grammar.y"
+  case 130:
+#line 1581 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     unit->error("keyword `" + ident->v + "' cannot be used as enumerator");
     EnumeratorListTokPtr ens = new EnumeratorListTok; // Dummy
     (yyval) = ens;
-;}
+}
+#line 3379 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 130:
-
-/* Line 1455 of yacc.c  */
-#line 1582 "../Slice/Grammar.y"
+  case 131:
+#line 1588 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     EnumeratorListTokPtr ens = new EnumeratorListTok;
     (yyval) = ens; // Dummy
-;}
+}
+#line 3388 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 131:
-
-/* Line 1455 of yacc.c  */
-#line 1592 "../Slice/Grammar.y"
+  case 132:
+#line 1598 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(1) - (1)]);
-;}
+    (yyval) = (yyvsp[0]);
+}
+#line 3396 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 132:
-
-/* Line 1455 of yacc.c  */
-#line 1596 "../Slice/Grammar.y"
+  case 133:
+#line 1602 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainedList cl = unit->currentContainer()->lookupContained(scoped->v);
     IntegerTokPtr tok;
     if(!cl.empty())
@@ -3720,433 +3429,407 @@ yyreduce:
     }
 
     (yyval) = tok;
-;}
+}
+#line 3434 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 133:
-
-/* Line 1455 of yacc.c  */
-#line 1635 "../Slice/Grammar.y"
+  case 134:
+#line 1641 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     BoolTokPtr out = new BoolTok;
     out->v = true;
     (yyval) = out;
-;}
+}
+#line 3444 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 134:
-
-/* Line 1455 of yacc.c  */
-#line 1641 "../Slice/Grammar.y"
+  case 135:
+#line 1647 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     BoolTokPtr out = new BoolTok;
     out->v = false;
     (yyval) = out;
-;}
+}
+#line 3454 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 135:
-
-/* Line 1455 of yacc.c  */
-#line 1652 "../Slice/Grammar.y"
+  case 136:
+#line 1658 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 3461 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 136:
-
-/* Line 1455 of yacc.c  */
-#line 1655 "../Slice/Grammar.y"
+  case 137:
+#line 1661 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[(3) - (3)]));
+    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2]));
+    OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[0]));
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag);
-	unit->currentContainer()->checkIntroduced(tsp->v.name, pd);
-        StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(2) - (3)]));
+        ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag);
+        unit->currentContainer()->checkIntroduced(tsp->v.name, pd);
+        StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-1]));
         if(!metaData->v.empty())
         {
             pd->setMetaData(metaData->v);
         }
     }
-;}
+}
+#line 3481 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 137:
-
-/* Line 1455 of yacc.c  */
-#line 1671 "../Slice/Grammar.y"
+  case 138:
+#line 1677 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (5)]));
-    OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[(5) - (5)]));
+    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2]));
+    OptionalDefTokPtr tsp = OptionalDefTokPtr::dynamicCast((yyvsp[0]));
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag);
-	unit->currentContainer()->checkIntroduced(tsp->v.name, pd);
-        StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(4) - (5)]));
+        ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag);
+        unit->currentContainer()->checkIntroduced(tsp->v.name, pd);
+        StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-1]));
         if(!metaData->v.empty())
         {
             pd->setMetaData(metaData->v);
         }
     }
-;}
-    break;
-
-  case 138:
-
-/* Line 1455 of yacc.c  */
-#line 1687 "../Slice/Grammar.y"
-    {
-    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (4)]));
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(3) - (4)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(4) - (4)]));
-    OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
-    if(op)
-    {
-	op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy
-	unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
-    }
-;}
+}
+#line 3501 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 139:
-
-/* Line 1455 of yacc.c  */
-#line 1699 "../Slice/Grammar.y"
+#line 1693 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (6)]));
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (6)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(6) - (6)]));
+    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-3]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy
-	unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
+        op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy
+        unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
     }
-;}
+}
+#line 3517 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 140:
-
-/* Line 1455 of yacc.c  */
-#line 1711 "../Slice/Grammar.y"
+#line 1705 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(3) - (3)]));
+    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-3]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy
-	unit->error("missing parameter name");
+        op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy
+        unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
     }
-;}
+}
+#line 3533 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 141:
-
-/* Line 1455 of yacc.c  */
-#line 1722 "../Slice/Grammar.y"
+#line 1717 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[(3) - (5)]));
-    TypePtr type = TypePtr::dynamicCast((yyvsp[(5) - (5)]));
+    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[0]));
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy
-	unit->error("missing parameter name");
+        op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy
+        unit->error("missing parameter name");
     }
-;}
+}
+#line 3548 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 142:
-
-/* Line 1455 of yacc.c  */
-#line 1738 "../Slice/Grammar.y"
+#line 1728 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = (yyvsp[(2) - (2)]);
-;}
+    BoolTokPtr isOutParam = BoolTokPtr::dynamicCast((yyvsp[-2]));
+    TypePtr type = TypePtr::dynamicCast((yyvsp[0]));
+    OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
+    if(op)
+    {
+        op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy
+        unit->error("missing parameter name");
+    }
+}
+#line 3563 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 143:
-
-/* Line 1455 of yacc.c  */
-#line 1742 "../Slice/Grammar.y"
+#line 1744 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    (yyval) = new ExceptionListTok;
-;}
+    (yyval) = (yyvsp[0]);
+}
+#line 3571 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 144:
-
-/* Line 1455 of yacc.c  */
-#line 1751 "../Slice/Grammar.y"
+#line 1748 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+    (yyval) = new ExceptionListTok;
+}
+#line 3579 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 145:
+#line 1757 "../Slice/Grammar.y" /* yacc.c:1646  */
+    {
+}
+#line 3586 "Grammar.tab.c" /* yacc.c:1646  */
+    break;
 
-/* Line 1455 of yacc.c  */
-#line 1754 "../Slice/Grammar.y"
+  case 146:
+#line 1760 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     ident->v = "::" + ident->v;
     (yyval) = ident;
-;}
+}
+#line 3596 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 146:
-
-/* Line 1455 of yacc.c  */
-#line 1760 "../Slice/Grammar.y"
+  case 147:
+#line 1766 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (3)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-2]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[0]));
     scoped->v += "::";
     scoped->v += ident->v;
     (yyval) = scoped;
-;}
+}
+#line 3608 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 147:
-
-/* Line 1455 of yacc.c  */
-#line 1773 "../Slice/Grammar.y"
+  case 148:
+#line 1779 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindByte);
-;}
+}
+#line 3616 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 148:
-
-/* Line 1455 of yacc.c  */
-#line 1777 "../Slice/Grammar.y"
+  case 149:
+#line 1783 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindBool);
-;}
+}
+#line 3624 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 149:
-
-/* Line 1455 of yacc.c  */
-#line 1781 "../Slice/Grammar.y"
+  case 150:
+#line 1787 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindShort);
-;}
+}
+#line 3632 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 150:
-
-/* Line 1455 of yacc.c  */
-#line 1785 "../Slice/Grammar.y"
+  case 151:
+#line 1791 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindInt);
-;}
+}
+#line 3640 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 151:
-
-/* Line 1455 of yacc.c  */
-#line 1789 "../Slice/Grammar.y"
+  case 152:
+#line 1795 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindLong);
-;}
+}
+#line 3648 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 152:
-
-/* Line 1455 of yacc.c  */
-#line 1793 "../Slice/Grammar.y"
+  case 153:
+#line 1799 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindFloat);
-;}
+}
+#line 3656 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 153:
-
-/* Line 1455 of yacc.c  */
-#line 1797 "../Slice/Grammar.y"
+  case 154:
+#line 1803 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindDouble);
-;}
+}
+#line 3664 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 154:
-
-/* Line 1455 of yacc.c  */
-#line 1801 "../Slice/Grammar.y"
+  case 155:
+#line 1807 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindString);
-;}
+}
+#line 3672 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 155:
-
-/* Line 1455 of yacc.c  */
-#line 1805 "../Slice/Grammar.y"
+  case 156:
+#line 1811 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindObject);
-;}
+}
+#line 3680 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 156:
-
-/* Line 1455 of yacc.c  */
-#line 1809 "../Slice/Grammar.y"
+  case 157:
+#line 1815 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindObjectProxy);
-;}
+}
+#line 3688 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 157:
-
-/* Line 1455 of yacc.c  */
-#line 1813 "../Slice/Grammar.y"
+  case 158:
+#line 1819 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     (yyval) = unit->builtin(Builtin::KindLocalObject);
-;}
+}
+#line 3696 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 158:
+  case 159:
+#line 1823 "../Slice/Grammar.y" /* yacc.c:1646  */
+    {
+    (yyval) = unit->builtin(Builtin::KindValue);
+}
+#line 3704 "Grammar.tab.c" /* yacc.c:1646  */
+    break;
 
-/* Line 1455 of yacc.c  */
-#line 1817 "../Slice/Grammar.y"
+  case 160:
+#line 1827 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
     ContainerPtr cont = unit->currentContainer();
     if(cont)
     {
-	TypeList types = cont->lookupType(scoped->v);
-	if(types.empty())
-	{
-	    YYERROR; // Can't continue, jump to next yyerrok
-	}
-	cont->checkIntroduced(scoped->v);
-	(yyval) = types.front();
+        TypeList types = cont->lookupType(scoped->v);
+        if(types.empty())
+        {
+            YYERROR; // Can't continue, jump to next yyerrok
+        }
+        cont->checkIntroduced(scoped->v);
+        (yyval) = types.front();
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 3727 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 159:
-
-/* Line 1455 of yacc.c  */
-#line 1836 "../Slice/Grammar.y"
+  case 161:
+#line 1846 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (2)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[-1]));
     ContainerPtr cont = unit->currentContainer();
     if(cont)
     {
-	TypeList types = cont->lookupType(scoped->v);
-	if(types.empty())
-	{
-	    YYERROR; // Can't continue, jump to next yyerrok
-	}
-	for(TypeList::iterator p = types.begin(); p != types.end(); ++p)
-	{
-	    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(*p);
-	    if(!cl)
-	    {
-		string msg = "`";
-		msg += scoped->v;
-		msg += "' must be class or interface";
-		unit->error(msg);
-		YYERROR; // Can't continue, jump to next yyerrok
-	    }
-	    cont->checkIntroduced(scoped->v);
-	    if(cl->isLocal())
-	    {
-		unit->error("cannot create proxy for " + cl->kindOf() + " `" + cl->name() + "'"); // $$ is dummy
-	    }
-	    *p = new Proxy(cl);
-	}
-	(yyval) = types.front();
+        TypeList types = cont->lookupType(scoped->v);
+        if(types.empty())
+        {
+            YYERROR; // Can't continue, jump to next yyerrok
+        }
+        for(TypeList::iterator p = types.begin(); p != types.end(); ++p)
+        {
+            ClassDeclPtr cl = ClassDeclPtr::dynamicCast(*p);
+            if(!cl)
+            {
+                string msg = "`";
+                msg += scoped->v;
+                msg += "' must be class or interface";
+                unit->error(msg);
+                YYERROR; // Can't continue, jump to next yyerrok
+            }
+            cont->checkIntroduced(scoped->v);
+            if(cl->isLocal())
+            {
+                unit->error("cannot create proxy for " + cl->kindOf() + " `" + cl->name() + "'"); // $$ is dummy
+            }
+            *p = new Proxy(cl);
+        }
+        (yyval) = types.front();
     }
     else
     {
         (yyval) = 0;
     }
-;}
+}
+#line 3767 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 160:
-
-/* Line 1455 of yacc.c  */
-#line 1877 "../Slice/Grammar.y"
+  case 162:
+#line 1887 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr str1 = StringTokPtr::dynamicCast((yyvsp[(1) - (2)]));
-    StringTokPtr str2 = StringTokPtr::dynamicCast((yyvsp[(2) - (2)]));
+    StringTokPtr str1 = StringTokPtr::dynamicCast((yyvsp[-1]));
+    StringTokPtr str2 = StringTokPtr::dynamicCast((yyvsp[0]));
     str1->v += str2->v;
-;}
+}
+#line 3777 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 161:
-
-/* Line 1455 of yacc.c  */
-#line 1883 "../Slice/Grammar.y"
+  case 163:
+#line 1893 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 3784 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 162:
-
-/* Line 1455 of yacc.c  */
-#line 1891 "../Slice/Grammar.y"
+  case 164:
+#line 1901 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[(3) - (3)]));
-    StringListTokPtr stringList = StringListTokPtr::dynamicCast((yyvsp[(1) - (3)]));
+    StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[0]));
+    StringListTokPtr stringList = StringListTokPtr::dynamicCast((yyvsp[-2]));
     stringList->v.push_back(str->v);
     (yyval) = stringList;
-;}
+}
+#line 3795 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 163:
-
-/* Line 1455 of yacc.c  */
-#line 1898 "../Slice/Grammar.y"
+  case 165:
+#line 1908 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr str = StringTokPtr::dynamicCast((yyvsp[0]));
     StringListTokPtr stringList = new StringListTok;
     stringList->v.push_back(str->v);
     (yyval) = stringList;
-;}
+}
+#line 3806 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 164:
-
-/* Line 1455 of yacc.c  */
-#line 1910 "../Slice/Grammar.y"
+  case 166:
+#line 1920 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     BoolTokPtr local = new BoolTok;
     local->v = true;
     (yyval) = local;
-;}
+}
+#line 3816 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 165:
-
-/* Line 1455 of yacc.c  */
-#line 1916 "../Slice/Grammar.y"
+  case 167:
+#line 1926 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     BoolTokPtr local = new BoolTok;
     local->v = false;
     (yyval) = local;
-;}
+}
+#line 3826 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 166:
-
-/* Line 1455 of yacc.c  */
-#line 1927 "../Slice/Grammar.y"
+  case 168:
+#line 1937 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     BuiltinPtr type = unit->builtin(Builtin::KindLong);
-    IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    IntegerTokPtr intVal = IntegerTokPtr::dynamicCast((yyvsp[0]));
     ostringstream sstr;
     sstr << intVal->v;
     ConstDefTokPtr def = new ConstDefTok;
@@ -4155,16 +3838,15 @@ yyreduce:
     def->v.valueAsString = sstr.str();
     def->v.valueAsLiteral = intVal->literal;
     (yyval) = def;
-;}
+}
+#line 3843 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 167:
-
-/* Line 1455 of yacc.c  */
-#line 1940 "../Slice/Grammar.y"
+  case 169:
+#line 1950 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     BuiltinPtr type = unit->builtin(Builtin::KindDouble);
-    FloatingTokPtr floatVal = FloatingTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    FloatingTokPtr floatVal = FloatingTokPtr::dynamicCast((yyvsp[0]));
     ostringstream sstr;
     sstr << floatVal->v;
     ConstDefTokPtr def = new ConstDefTok;
@@ -4173,15 +3855,14 @@ yyreduce:
     def->v.valueAsString = sstr.str();
     def->v.valueAsLiteral = floatVal->literal;
     (yyval) = def;
-;}
+}
+#line 3860 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 168:
-
-/* Line 1455 of yacc.c  */
-#line 1953 "../Slice/Grammar.y"
+  case 170:
+#line 1963 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr scoped = StringTokPtr::dynamicCast((yyvsp[0]));
     ConstDefTokPtr def = new ConstDefTok;
     ContainedList cl = unit->currentContainer()->lookupContained(scoped->v);
     if(cl.empty())
@@ -4193,9 +3874,9 @@ yyreduce:
     }
     else
     {
-	EnumeratorPtr enumerator = EnumeratorPtr::dynamicCast(cl.front());
+        EnumeratorPtr enumerator = EnumeratorPtr::dynamicCast(cl.front());
         ConstPtr constant = ConstPtr::dynamicCast(cl.front());
-	if(enumerator)
+        if(enumerator)
         {
             unit->currentContainer()->checkIntroduced(scoped->v, enumerator);
             def->v.type = enumerator->type();
@@ -4211,336 +3892,319 @@ yyreduce:
             def->v.valueAsLiteral = constant->value();
         }
         else
-	{
-	    string msg = "illegal initializer: `" + scoped->v + "' is a";
-	    static const string vowels = "aeiou";
-	    string kindOf = cl.front()->kindOf();
-	    if(vowels.find_first_of(kindOf[0]) != string::npos)
-	    {
-	    	msg += "n";
-	    }
-	    msg += " " + kindOf;
-	    unit->error(msg); // $$ is dummy
-	}
+        {
+            string msg = "illegal initializer: `" + scoped->v + "' is a";
+            static const string vowels = "aeiou";
+            string kindOf = cl.front()->kindOf();
+            if(vowels.find_first_of(kindOf[0]) != string::npos)
+            {
+                msg += "n";
+            }
+            msg += " " + kindOf;
+            unit->error(msg); // $$ is dummy
+        }
     }
     (yyval) = def;
-;}
+}
+#line 3910 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 169:
-
-/* Line 1455 of yacc.c  */
-#line 1999 "../Slice/Grammar.y"
+  case 171:
+#line 2009 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     BuiltinPtr type = unit->builtin(Builtin::KindString);
-    StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[0]));
     ConstDefTokPtr def = new ConstDefTok;
     def->v.type = type;
     def->v.value = type;
     def->v.valueAsString = literal->v;
     def->v.valueAsLiteral = literal->literal;
     (yyval) = def;
-;}
+}
+#line 3925 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 170:
-
-/* Line 1455 of yacc.c  */
-#line 2010 "../Slice/Grammar.y"
+  case 172:
+#line 2020 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     BuiltinPtr type = unit->builtin(Builtin::KindBool);
-    StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[0]));
     ConstDefTokPtr def = new ConstDefTok;
     def->v.type = type;
     def->v.value = type;
     def->v.valueAsString = "false";
     def->v.valueAsLiteral = "false";
     (yyval) = def;
-;}
+}
+#line 3940 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 171:
-
-/* Line 1455 of yacc.c  */
-#line 2021 "../Slice/Grammar.y"
+  case 173:
+#line 2031 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
     BuiltinPtr type = unit->builtin(Builtin::KindBool);
-    StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[(1) - (1)]));
+    StringTokPtr literal = StringTokPtr::dynamicCast((yyvsp[0]));
     ConstDefTokPtr def = new ConstDefTok;
     def->v.type = type;
     def->v.value = type;
     def->v.valueAsString = "true";
     def->v.valueAsLiteral = "true";
     (yyval) = def;
-;}
+}
+#line 3955 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 172:
-
-/* Line 1455 of yacc.c  */
-#line 2037 "../Slice/Grammar.y"
+  case 174:
+#line 2047 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(2) - (6)]));
-    TypePtr const_type = TypePtr::dynamicCast((yyvsp[(3) - (6)]));
-    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[(4) - (6)]));
-    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(6) - (6)]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-4]));
+    TypePtr const_type = TypePtr::dynamicCast((yyvsp[-3]));
+    StringTokPtr ident = StringTokPtr::dynamicCast((yyvsp[-2]));
+    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[0]));
     (yyval) = unit->currentContainer()->createConst(ident->v, const_type, metaData->v, value->v.value,
                                                value->v.valueAsString, value->v.valueAsLiteral);
-;}
+}
+#line 3968 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
-  case 173:
-
-/* Line 1455 of yacc.c  */
-#line 2046 "../Slice/Grammar.y"
+  case 175:
+#line 2056 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[(2) - (5)]));
-    TypePtr const_type = TypePtr::dynamicCast((yyvsp[(3) - (5)]));
-    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[(5) - (5)]));
+    StringListTokPtr metaData = StringListTokPtr::dynamicCast((yyvsp[-3]));
+    TypePtr const_type = TypePtr::dynamicCast((yyvsp[-2]));
+    ConstDefTokPtr value = ConstDefTokPtr::dynamicCast((yyvsp[0]));
     unit->error("missing constant name");
     (yyval) = unit->currentContainer()->createConst(IceUtil::generateUUID(), const_type, metaData->v, value->v.value,
                                                value->v.valueAsString, value->v.valueAsLiteral, Dummy); // Dummy
-;}
-    break;
-
-  case 174:
-
-/* Line 1455 of yacc.c  */
-#line 2060 "../Slice/Grammar.y"
-    {
-;}
-    break;
-
-  case 175:
-
-/* Line 1455 of yacc.c  */
-#line 2063 "../Slice/Grammar.y"
-    {
-;}
+}
+#line 3981 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 176:
-
-/* Line 1455 of yacc.c  */
-#line 2066 "../Slice/Grammar.y"
+#line 2070 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 3988 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 177:
-
-/* Line 1455 of yacc.c  */
-#line 2069 "../Slice/Grammar.y"
+#line 2073 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 3995 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 178:
-
-/* Line 1455 of yacc.c  */
-#line 2072 "../Slice/Grammar.y"
+#line 2076 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4002 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 179:
-
-/* Line 1455 of yacc.c  */
-#line 2075 "../Slice/Grammar.y"
+#line 2079 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4009 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 180:
-
-/* Line 1455 of yacc.c  */
-#line 2078 "../Slice/Grammar.y"
+#line 2082 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4016 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 181:
-
-/* Line 1455 of yacc.c  */
-#line 2081 "../Slice/Grammar.y"
+#line 2085 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4023 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 182:
-
-/* Line 1455 of yacc.c  */
-#line 2084 "../Slice/Grammar.y"
+#line 2088 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4030 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 183:
-
-/* Line 1455 of yacc.c  */
-#line 2087 "../Slice/Grammar.y"
+#line 2091 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4037 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 184:
-
-/* Line 1455 of yacc.c  */
-#line 2090 "../Slice/Grammar.y"
+#line 2094 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4044 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 185:
-
-/* Line 1455 of yacc.c  */
-#line 2093 "../Slice/Grammar.y"
+#line 2097 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4051 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 186:
-
-/* Line 1455 of yacc.c  */
-#line 2096 "../Slice/Grammar.y"
+#line 2100 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4058 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 187:
-
-/* Line 1455 of yacc.c  */
-#line 2099 "../Slice/Grammar.y"
+#line 2103 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4065 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 188:
-
-/* Line 1455 of yacc.c  */
-#line 2102 "../Slice/Grammar.y"
+#line 2106 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4072 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 189:
-
-/* Line 1455 of yacc.c  */
-#line 2105 "../Slice/Grammar.y"
+#line 2109 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4079 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 190:
-
-/* Line 1455 of yacc.c  */
-#line 2108 "../Slice/Grammar.y"
+#line 2112 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4086 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 191:
-
-/* Line 1455 of yacc.c  */
-#line 2111 "../Slice/Grammar.y"
+#line 2115 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4093 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 192:
-
-/* Line 1455 of yacc.c  */
-#line 2114 "../Slice/Grammar.y"
+#line 2118 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4100 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 193:
-
-/* Line 1455 of yacc.c  */
-#line 2117 "../Slice/Grammar.y"
+#line 2121 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4107 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 194:
-
-/* Line 1455 of yacc.c  */
-#line 2120 "../Slice/Grammar.y"
+#line 2124 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4114 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 195:
-
-/* Line 1455 of yacc.c  */
-#line 2123 "../Slice/Grammar.y"
+#line 2127 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4121 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 196:
-
-/* Line 1455 of yacc.c  */
-#line 2126 "../Slice/Grammar.y"
+#line 2130 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4128 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 197:
-
-/* Line 1455 of yacc.c  */
-#line 2129 "../Slice/Grammar.y"
+#line 2133 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4135 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 198:
-
-/* Line 1455 of yacc.c  */
-#line 2132 "../Slice/Grammar.y"
+#line 2136 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4142 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 199:
-
-/* Line 1455 of yacc.c  */
-#line 2135 "../Slice/Grammar.y"
+#line 2139 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4149 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 200:
-
-/* Line 1455 of yacc.c  */
-#line 2138 "../Slice/Grammar.y"
+#line 2142 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4156 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 201:
-
-/* Line 1455 of yacc.c  */
-#line 2141 "../Slice/Grammar.y"
+#line 2145 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4163 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
   case 202:
+#line 2148 "../Slice/Grammar.y" /* yacc.c:1646  */
+    {
+}
+#line 4170 "Grammar.tab.c" /* yacc.c:1646  */
+    break;
 
-/* Line 1455 of yacc.c  */
-#line 2144 "../Slice/Grammar.y"
+  case 203:
+#line 2151 "../Slice/Grammar.y" /* yacc.c:1646  */
     {
-;}
+}
+#line 4177 "Grammar.tab.c" /* yacc.c:1646  */
     break;
 
+  case 204:
+#line 2154 "../Slice/Grammar.y" /* yacc.c:1646  */
+    {
+}
+#line 4184 "Grammar.tab.c" /* yacc.c:1646  */
+    break;
+
+  case 205:
+#line 2157 "../Slice/Grammar.y" /* yacc.c:1646  */
+    {
+}
+#line 4191 "Grammar.tab.c" /* yacc.c:1646  */
+    break;
 
 
-/* Line 1455 of yacc.c  */
-#line 4542 "Grammar.tab.c"
+#line 4195 "Grammar.tab.c" /* yacc.c:1646  */
       default: break;
     }
+  /* User semantic actions sometimes alter yychar, and that requires
+     that yytoken be updated with the new translation.  We take the
+     approach of translating immediately before every use of yytoken.
+     One alternative is translating here after every semantic action,
+     but that translation would be missed if the semantic action invokes
+     YYABORT, YYACCEPT, or YYERROR immediately after altering yychar or
+     if it invokes YYBACKUP.  In the case of YYABORT or YYACCEPT, an
+     incorrect destructor might then be invoked immediately.  In the
+     case of YYERROR or YYBACKUP, subsequent parser actions might lead
+     to an incorrect destructor call or verbose syntax error message
+     before the lookahead is translated.  */
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
 
   YYPOPSTACK (yylen);
@@ -4549,7 +4213,7 @@ yyreduce:
 
   *++yyvsp = yyval;
 
-  /* Now `shift' the result of the reduction.  Determine what state
+  /* Now 'shift' the result of the reduction.  Determine what state
      that goes to, based on the state we popped back to and the rule
      number reduced by.  */
 
@@ -4564,10 +4228,14 @@ yyreduce:
   goto yynewstate;
 
 
-/*------------------------------------.
-| yyerrlab -- here on detecting error |
-`------------------------------------*/
+/*--------------------------------------.
+| yyerrlab -- here on detecting error.  |
+`--------------------------------------*/
 yyerrlab:
+  /* Make sure we have latest lookahead translation.  See comments at
+     user semantic actions for why this is necessary.  */
+  yytoken = yychar == YYEMPTY ? YYEMPTY : YYTRANSLATE (yychar);
+
   /* If not already recovering from an error, report this error.  */
   if (!yyerrstatus)
     {
@@ -4575,37 +4243,36 @@ yyerrlab:
 #if ! YYERROR_VERBOSE
       yyerror (YY_("syntax error"));
 #else
+# define YYSYNTAX_ERROR yysyntax_error (&yymsg_alloc, &yymsg, \
+                                        yyssp, yytoken)
       {
-	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
-	if (yymsg_alloc < yysize && yymsg_alloc < YYSTACK_ALLOC_MAXIMUM)
-	  {
-	    YYSIZE_T yyalloc = 2 * yysize;
-	    if (! (yysize <= yyalloc && yyalloc <= YYSTACK_ALLOC_MAXIMUM))
-	      yyalloc = YYSTACK_ALLOC_MAXIMUM;
-	    if (yymsg != yymsgbuf)
-	      YYSTACK_FREE (yymsg);
-	    yymsg = (char *) YYSTACK_ALLOC (yyalloc);
-	    if (yymsg)
-	      yymsg_alloc = yyalloc;
-	    else
-	      {
-		yymsg = yymsgbuf;
-		yymsg_alloc = sizeof yymsgbuf;
-	      }
-	  }
-
-	if (0 < yysize && yysize <= yymsg_alloc)
-	  {
-	    (void) yysyntax_error (yymsg, yystate, yychar);
-	    yyerror (yymsg);
-	  }
-	else
-	  {
-	    yyerror (YY_("syntax error"));
-	    if (yysize != 0)
-	      goto yyexhaustedlab;
-	  }
+        char const *yymsgp = YY_("syntax error");
+        int yysyntax_error_status;
+        yysyntax_error_status = YYSYNTAX_ERROR;
+        if (yysyntax_error_status == 0)
+          yymsgp = yymsg;
+        else if (yysyntax_error_status == 1)
+          {
+            if (yymsg != yymsgbuf)
+              YYSTACK_FREE (yymsg);
+            yymsg = (char *) YYSTACK_ALLOC (yymsg_alloc);
+            if (!yymsg)
+              {
+                yymsg = yymsgbuf;
+                yymsg_alloc = sizeof yymsgbuf;
+                yysyntax_error_status = 2;
+              }
+            else
+              {
+                yysyntax_error_status = YYSYNTAX_ERROR;
+                yymsgp = yymsg;
+              }
+          }
+        yyerror (yymsgp);
+        if (yysyntax_error_status == 2)
+          goto yyexhaustedlab;
       }
+# undef YYSYNTAX_ERROR
 #endif
     }
 
@@ -4614,20 +4281,20 @@ yyerrlab:
   if (yyerrstatus == 3)
     {
       /* If just tried and failed to reuse lookahead token after an
-	 error, discard it.  */
+         error, discard it.  */
 
       if (yychar <= YYEOF)
-	{
-	  /* Return failure if at end of input.  */
-	  if (yychar == YYEOF)
-	    YYABORT;
-	}
+        {
+          /* Return failure if at end of input.  */
+          if (yychar == YYEOF)
+            YYABORT;
+        }
       else
-	{
-	  yydestruct ("Error: discarding",
-		      yytoken, &yylval);
-	  yychar = YYEMPTY;
-	}
+        {
+          yydestruct ("Error: discarding",
+                      yytoken, &yylval);
+          yychar = YYEMPTY;
+        }
     }
 
   /* Else will try to reuse lookahead token after shifting the error
@@ -4646,7 +4313,7 @@ yyerrorlab:
   if (/*CONSTCOND*/ 0)
      goto yyerrorlab;
 
-  /* Do not reclaim the symbols of the rule which action triggered
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYERROR.  */
   YYPOPSTACK (yylen);
   yylen = 0;
@@ -4659,35 +4326,37 @@ yyerrorlab:
 | yyerrlab1 -- common code for both syntax error and YYERROR.  |
 `-------------------------------------------------------------*/
 yyerrlab1:
-  yyerrstatus = 3;	/* Each real token shifted decrements this.  */
+  yyerrstatus = 3;      /* Each real token shifted decrements this.  */
 
   for (;;)
     {
       yyn = yypact[yystate];
-      if (yyn != YYPACT_NINF)
-	{
-	  yyn += YYTERROR;
-	  if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
-	    {
-	      yyn = yytable[yyn];
-	      if (0 < yyn)
-		break;
-	    }
-	}
+      if (!yypact_value_is_default (yyn))
+        {
+          yyn += YYTERROR;
+          if (0 <= yyn && yyn <= YYLAST && yycheck[yyn] == YYTERROR)
+            {
+              yyn = yytable[yyn];
+              if (0 < yyn)
+                break;
+            }
+        }
 
       /* Pop the current state because it cannot handle the error token.  */
       if (yyssp == yyss)
-	YYABORT;
+        YYABORT;
 
 
       yydestruct ("Error: popping",
-		  yystos[yystate], yyvsp);
+                  yystos[yystate], yyvsp);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
     }
 
+  YY_IGNORE_MAYBE_UNINITIALIZED_BEGIN
   *++yyvsp = yylval;
+  YY_IGNORE_MAYBE_UNINITIALIZED_END
 
 
   /* Shift the error token.  */
@@ -4711,7 +4380,7 @@ yyabortlab:
   yyresult = 1;
   goto yyreturn;
 
-#if !defined(yyoverflow) || YYERROR_VERBOSE
+#if !defined yyoverflow || YYERROR_VERBOSE
 /*-------------------------------------------------.
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
@@ -4723,16 +4392,21 @@ yyexhaustedlab:
 
 yyreturn:
   if (yychar != YYEMPTY)
-     yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval);
-  /* Do not reclaim the symbols of the rule which action triggered
+    {
+      /* Make sure we have latest lookahead translation.  See comments at
+         user semantic actions for why this is necessary.  */
+      yytoken = YYTRANSLATE (yychar);
+      yydestruct ("Cleanup: discarding lookahead",
+                  yytoken, &yylval);
+    }
+  /* Do not reclaim the symbols of the rule whose action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
   YY_STACK_PRINT (yyss, yyssp);
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp);
+                  yystos[*yyssp], yyvsp);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
@@ -4743,13 +4417,7 @@ yyreturn:
   if (yymsg != yymsgbuf)
     YYSTACK_FREE (yymsg);
 #endif
-  /* Make sure YYID is used.  */
-  return YYID (yyresult);
+  return yyresult;
 }
-
-
-
-/* Line 1675 of yacc.c  */
-#line 2148 "../Slice/Grammar.y"
-
+#line 2161 "../Slice/Grammar.y" /* yacc.c:1906  */
 
diff --git a/cpp/src/Slice/Grammar.h b/cpp/src/Slice/Grammar.h
index 0ee3d141315..66aa4b73ccd 100644
--- a/cpp/src/Slice/Grammar.h
+++ b/cpp/src/Slice/Grammar.h
@@ -1,21 +1,19 @@
+/* A Bison parser, made by GNU Bison 3.0.2.  */
 
-/* A Bison parser, made by GNU Bison 2.4.1.  */
+/* Bison interface for Yacc-like parsers in C
+
+   Copyright (C) 1984, 1989-1990, 2000-2013 Free Software Foundation, Inc.
 
-/* Skeleton interface for Bison's Yacc-like parsers in C
-   
-      Copyright (C) 1984, 1989, 1990, 2000, 2001, 2002, 2003, 2004, 2005, 2006
-   Free Software Foundation, Inc.
-   
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
    the Free Software Foundation, either version 3 of the License, or
    (at your option) any later version.
-   
+
    This program is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
    GNU General Public License for more details.
-   
+
    You should have received a copy of the GNU General Public License
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
@@ -28,71 +26,80 @@
    special exception, which will cause the skeleton and the resulting
    Bison output files to be licensed under the GNU General Public
    License without this special exception.
-   
+
    This special exception was added by the Free Software Foundation in
    version 2.2 of Bison.  */
 
+#ifndef YY_SLICE_GRAMMAR_TAB_H_INCLUDED
+# define YY_SLICE_GRAMMAR_TAB_H_INCLUDED
+/* Debug traces.  */
+#ifndef YYDEBUG
+# define YYDEBUG 1
+#endif
+#if YYDEBUG
+extern int slice_debug;
+#endif
 
-/* Tokens.  */
+/* Token type.  */
 #ifndef YYTOKENTYPE
 # define YYTOKENTYPE
-   /* Put the tokens into the symbol table, so that GDB and other debuggers
-      know about them.  */
-   enum yytokentype {
-     ICE_MODULE = 258,
-     ICE_CLASS = 259,
-     ICE_INTERFACE = 260,
-     ICE_EXCEPTION = 261,
-     ICE_STRUCT = 262,
-     ICE_SEQUENCE = 263,
-     ICE_DICTIONARY = 264,
-     ICE_ENUM = 265,
-     ICE_OUT = 266,
-     ICE_EXTENDS = 267,
-     ICE_IMPLEMENTS = 268,
-     ICE_THROWS = 269,
-     ICE_VOID = 270,
-     ICE_BYTE = 271,
-     ICE_BOOL = 272,
-     ICE_SHORT = 273,
-     ICE_INT = 274,
-     ICE_LONG = 275,
-     ICE_FLOAT = 276,
-     ICE_DOUBLE = 277,
-     ICE_STRING = 278,
-     ICE_OBJECT = 279,
-     ICE_LOCAL_OBJECT = 280,
-     ICE_LOCAL = 281,
-     ICE_CONST = 282,
-     ICE_FALSE = 283,
-     ICE_TRUE = 284,
-     ICE_IDEMPOTENT = 285,
-     ICE_OPTIONAL = 286,
-     ICE_SCOPE_DELIMITER = 287,
-     ICE_IDENTIFIER = 288,
-     ICE_STRING_LITERAL = 289,
-     ICE_INTEGER_LITERAL = 290,
-     ICE_FLOATING_POINT_LITERAL = 291,
-     ICE_IDENT_OP = 292,
-     ICE_KEYWORD_OP = 293,
-     ICE_OPTIONAL_OP = 294,
-     ICE_METADATA_OPEN = 295,
-     ICE_METADATA_CLOSE = 296,
-     ICE_GLOBAL_METADATA_OPEN = 297,
-     ICE_GLOBAL_METADATA_CLOSE = 298,
-     BAD_CHAR = 299
-   };
+  enum yytokentype
+  {
+    ICE_MODULE = 258,
+    ICE_CLASS = 259,
+    ICE_INTERFACE = 260,
+    ICE_EXCEPTION = 261,
+    ICE_STRUCT = 262,
+    ICE_SEQUENCE = 263,
+    ICE_DICTIONARY = 264,
+    ICE_ENUM = 265,
+    ICE_OUT = 266,
+    ICE_EXTENDS = 267,
+    ICE_IMPLEMENTS = 268,
+    ICE_THROWS = 269,
+    ICE_VOID = 270,
+    ICE_BYTE = 271,
+    ICE_BOOL = 272,
+    ICE_SHORT = 273,
+    ICE_INT = 274,
+    ICE_LONG = 275,
+    ICE_FLOAT = 276,
+    ICE_DOUBLE = 277,
+    ICE_STRING = 278,
+    ICE_OBJECT = 279,
+    ICE_LOCAL_OBJECT = 280,
+    ICE_LOCAL = 281,
+    ICE_CONST = 282,
+    ICE_FALSE = 283,
+    ICE_TRUE = 284,
+    ICE_IDEMPOTENT = 285,
+    ICE_OPTIONAL = 286,
+    ICE_VALUE = 287,
+    ICE_SCOPE_DELIMITER = 288,
+    ICE_IDENTIFIER = 289,
+    ICE_STRING_LITERAL = 290,
+    ICE_INTEGER_LITERAL = 291,
+    ICE_FLOATING_POINT_LITERAL = 292,
+    ICE_IDENT_OP = 293,
+    ICE_KEYWORD_OP = 294,
+    ICE_OPTIONAL_OP = 295,
+    ICE_METADATA_OPEN = 296,
+    ICE_METADATA_CLOSE = 297,
+    ICE_GLOBAL_METADATA_OPEN = 298,
+    ICE_GLOBAL_METADATA_CLOSE = 299,
+    BAD_CHAR = 300
+  };
 #endif
 
-
-
+/* Value type.  */
 #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED
 typedef int YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
-# define yystype YYSTYPE /* obsolescent; will be withdrawn */
 # define YYSTYPE_IS_DECLARED 1
 #endif
 
 
 
+int slice_parse (void);
 
+#endif /* !YY_SLICE_GRAMMAR_TAB_H_INCLUDED  */
diff --git a/cpp/src/Slice/Grammar.y b/cpp/src/Slice/Grammar.y
index 0becd8f5af6..aa23910ee42 100644
--- a/cpp/src/Slice/Grammar.y
+++ b/cpp/src/Slice/Grammar.y
@@ -40,11 +40,11 @@ slice_error(const char* s)
 
     if (strcmp(s, "parse error") == 0)
     {
-	unit->error("syntax error");
+        unit->error("syntax error");
     }
     else
     {
-	unit->error(s);
+        unit->error(s);
     }
 }
 
@@ -86,6 +86,7 @@ slice_error(const char* s)
 %token ICE_TRUE
 %token ICE_IDEMPOTENT
 %token ICE_OPTIONAL
+%token ICE_VALUE
 
 //
 // Other tokens.
@@ -156,7 +157,7 @@ definitions
     ContainedPtr contained = ContainedPtr::dynamicCast($2);
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+        contained->setMetaData(metaData->v);
     }
 }
 ';' definitions
@@ -242,9 +243,9 @@ module_def
     ModulePtr module = cont->createModule(ident->v);
     if(module)
     {
-	cont->checkIntroduced(ident->v, module);
-	unit->pushContainer(module);
-	$$ = module;
+        cont->checkIntroduced(ident->v, module);
+        unit->pushContainer(module);
+        $$ = module;
     }
     else
     {
@@ -255,8 +256,8 @@ module_def
 {
     if($3)
     {
-	unit->popContainer();
-	$$ = $3;
+        unit->popContainer();
+        $$ = $3;
     }
     else
     {
@@ -302,8 +303,8 @@ exception_def
     ExceptionPtr ex = cont->createException(ident->v, base, local->v);
     if(ex)
     {
-	cont->checkIntroduced(ident->v, ex);
-	unit->pushContainer(ex);
+        cont->checkIntroduced(ident->v, ex);
+        unit->pushContainer(ex);
     }
     $$ = ex;
 }
@@ -311,7 +312,7 @@ exception_def
 {
     if($4)
     {
-	unit->popContainer();
+        unit->popContainer();
     }
     $$ = $4;
 }
@@ -343,7 +344,7 @@ exception_exports
     ContainedPtr contained = ContainedPtr::dynamicCast($2);
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+        contained->setMetaData(metaData->v);
     }
 }
 | error ';' exception_exports
@@ -533,8 +534,8 @@ struct_def
     StructPtr st = cont->createStruct(ident->v, local->v);
     if(st)
     {
-	cont->checkIntroduced(ident->v, st);
-	unit->pushContainer(st);
+        cont->checkIntroduced(ident->v, st);
+        unit->pushContainer(st);
     }
     else
     {
@@ -548,7 +549,7 @@ struct_def
 {
     if($3)
     {
-	unit->popContainer();
+        unit->popContainer();
     }
     $$ = $3;
 
@@ -559,7 +560,7 @@ struct_def
     assert(st);
     if(st->dataMembers().empty())
     {
-    	unit->error("struct `" + st->name() + "' must have at least one member"); // $$ is a dummy
+        unit->error("struct `" + st->name() + "' must have at least one member"); // $$ is a dummy
     }
 }
 ;
@@ -573,7 +574,7 @@ struct_exports
     ContainedPtr contained = ContainedPtr::dynamicCast($2);
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+        contained->setMetaData(metaData->v);
     }
 }
 | error ';' struct_exports
@@ -736,14 +737,14 @@ class_def
     ClassListTokPtr bases = ClassListTokPtr::dynamicCast($4);
     if(base)
     {
-	bases->v.push_front(base);
+    bases->v.push_front(base);
     }
     ClassDefPtr cl = cont->createClassDef(ident->v, ident->t, false, bases->v, local->v);
     if(cl)
     {
-	cont->checkIntroduced(ident->v, cl);
-	unit->pushContainer(cl);
-	$$ = cl;
+        cont->checkIntroduced(ident->v, cl);
+        unit->pushContainer(cl);
+        $$ = cl;
     }
     else
     {
@@ -754,8 +755,8 @@ class_def
 {
     if($5)
     {
-	unit->popContainer();
-	$$ = $5;
+        unit->popContainer();
+        $$ = $5;
     }
     else
     {
@@ -775,30 +776,30 @@ class_extends
     $$ = 0;
     if(!types.empty())
     {
-	ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
-	if(!cl || cl->isInterface())
-	{
-	    string msg = "`";
-	    msg += scoped->v;
-	    msg += "' is not a class";
-	    unit->error(msg);
-	}
-	else
-	{
-	    ClassDefPtr def = cl->definition();
-	    if(!def)
-	    {
-		string msg = "`";
-		msg += scoped->v;
-		msg += "' has been declared but not defined";
-		unit->error(msg);
-	    }
-	    else
-	    {
-	    	cont->checkIntroduced(scoped->v);
-		$$ = def;
-	    }
-	}
+        ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
+        if(!cl || cl->isInterface())
+        {
+            string msg = "`";
+            msg += scoped->v;
+            msg += "' is not a class";
+            unit->error(msg);
+        }
+        else
+        {
+            ClassDefPtr def = cl->definition();
+            if(!def)
+            {
+                string msg = "`";
+                msg += scoped->v;
+                msg += "' has been declared but not defined";
+                unit->error(msg);
+            }
+            else
+            {
+                cont->checkIntroduced(scoped->v);
+                $$ = def;
+            }
+        }
     }
 }
 |
@@ -829,7 +830,7 @@ class_exports
     ContainedPtr contained = ContainedPtr::dynamicCast($2);
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+        contained->setMetaData(metaData->v);
     }
 }
 | error ';' class_exports
@@ -1039,17 +1040,17 @@ operation_preamble
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
-	OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag);
-	if(op)
-	{
-	    cl->checkIntroduced(name, op);
-	    unit->pushContainer(op);
-	    $$ = op;
-	}
-	else
-	{
-	    $$ = 0;
-	}
+        OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag);
+        if(op)
+        {
+            cl->checkIntroduced(name, op);
+            unit->pushContainer(op);
+            $$ = op;
+        }
+        else
+        {
+            $$ = 0;
+        }
     }
     else
     {
@@ -1063,18 +1064,18 @@ operation_preamble
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
-	OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag,
-                                              Operation::Idempotent);
-	if(op)
-	{
-	    cl->checkIntroduced(name, op);
-	    unit->pushContainer(op);
-	    $$ = op;
-	}
-	else
-	{
-	    $$ = 0;
-	}
+        OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag,
+                                                Operation::Idempotent);
+        if(op)
+        {
+            cl->checkIntroduced(name, op);
+            unit->pushContainer(op);
+            $$ = op;
+        }
+        else
+        {
+            $$ = 0;
+        }
     }
     else
     {
@@ -1088,17 +1089,17 @@ operation_preamble
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
-	OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag);
-	if(op)
-	{
-	    unit->pushContainer(op);
-	    unit->error("keyword `" + name + "' cannot be used as operation name");
-	    $$ = op; // Dummy
-	}
-	else
-	{
-	    $$ = 0;
-	}
+        OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag);
+        if(op)
+        {
+            unit->pushContainer(op);
+            unit->error("keyword `" + name + "' cannot be used as operation name");
+            $$ = op; // Dummy
+        }
+        else
+        {
+            $$ = 0;
+        }
     }
     else
     {
@@ -1112,22 +1113,22 @@ operation_preamble
     ClassDefPtr cl = ClassDefPtr::dynamicCast(unit->currentContainer());
     if(cl)
     {
-	OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag,
-                                              Operation::Idempotent);
-	if(op)
-	{
-	    unit->pushContainer(op);
-	    unit->error("keyword `" + name + "' cannot be used as operation name");
-	    $$ = op; // Dummy
-	}
-	else
-	{
-	    return 0;
-	}
+        OperationPtr op = cl->createOperation(name, returnType->v.type, returnType->v.optional, returnType->v.tag,
+                                                Operation::Idempotent);
+        if(op)
+        {
+            unit->pushContainer(op);
+            unit->error("keyword `" + name + "' cannot be used as operation name");
+            $$ = op; // Dummy
+        }
+        else
+        {
+            return 0;
+        }
     }
     else
     {
-    	$$ = 0;
+        $$ = 0;
     }
 }
 ;
@@ -1139,8 +1140,8 @@ operation
 {
     if($1)
     {
-	unit->popContainer();
-	$$ = $1;
+        unit->popContainer();
+        $$ = $1;
     }
     else
     {
@@ -1161,7 +1162,7 @@ throws
 {
     if($1)
     {
-	unit->popContainer();
+        unit->popContainer();
     }
     yyerrok;
 }
@@ -1225,9 +1226,9 @@ interface_def
     ClassDefPtr cl = cont->createClassDef(ident->v, -1, true, bases->v, local->v);
     if(cl)
     {
-	cont->checkIntroduced(ident->v, cl);
-	unit->pushContainer(cl);
-	$$ = cl;
+    cont->checkIntroduced(ident->v, cl);
+    unit->pushContainer(cl);
+    $$ = cl;
     }
     else
     {
@@ -1238,12 +1239,12 @@ interface_def
 {
     if($4)
     {
-	unit->popContainer();
-	$$ = $4;
+    unit->popContainer();
+    $$ = $4;
     }
     else
     {
-	$$ = 0;
+    $$ = 0;
     }
 }
 ;
@@ -1259,30 +1260,30 @@ interface_list
     TypeList types = cont->lookupType(scoped->v);
     if(!types.empty())
     {
-	ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
-	if(!cl || !cl->isInterface())
-	{
-	    string msg = "`";
-	    msg += scoped->v;
-	    msg += "' is not an interface";
-	    unit->error(msg);
-	}
-	else
-	{
-	    ClassDefPtr def = cl->definition();
-	    if(!def)
-	    {
-		string msg = "`";
-		msg += scoped->v;
-		msg += "' has been declared but not defined";
-		unit->error(msg);
-	    }
-	    else
-	    {
-	    	cont->checkIntroduced(scoped->v);
-		intfs->v.push_front(def);
-	    }
-	}
+    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
+    if(!cl || !cl->isInterface())
+    {
+        string msg = "`";
+        msg += scoped->v;
+        msg += "' is not an interface";
+        unit->error(msg);
+    }
+    else
+    {
+        ClassDefPtr def = cl->definition();
+        if(!def)
+        {
+        string msg = "`";
+        msg += scoped->v;
+        msg += "' has been declared but not defined";
+        unit->error(msg);
+        }
+        else
+        {
+            cont->checkIntroduced(scoped->v);
+        intfs->v.push_front(def);
+        }
+    }
     }
     $$ = intfs;
 }
@@ -1294,30 +1295,30 @@ interface_list
     TypeList types = cont->lookupType(scoped->v);
     if(!types.empty())
     {
-	ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
-	if(!cl || !cl->isInterface())
-	{
-	    string msg = "`";
-	    msg += scoped->v;
-	    msg += "' is not an interface";
-	    unit->error(msg); // $$ is a dummy
-	}
-	else
-	{
-	    ClassDefPtr def = cl->definition();
-	    if(!def)
-	    {
-		string msg = "`";
-		msg += scoped->v;
-		msg += "' has been declared but not defined";
-		unit->error(msg); // $$ is a dummy
-	    }
-	    else
-	    {
-	    	cont->checkIntroduced(scoped->v);
-		intfs->v.push_front(def);
-	    }
-	}
+    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(types.front());
+    if(!cl || !cl->isInterface())
+    {
+        string msg = "`";
+        msg += scoped->v;
+        msg += "' is not an interface";
+        unit->error(msg); // $$ is a dummy
+    }
+    else
+    {
+        ClassDefPtr def = cl->definition();
+        if(!def)
+        {
+        string msg = "`";
+        msg += scoped->v;
+        msg += "' has been declared but not defined";
+        unit->error(msg); // $$ is a dummy
+        }
+        else
+        {
+            cont->checkIntroduced(scoped->v);
+        intfs->v.push_front(def);
+        }
+    }
     }
     $$ = intfs;
 }
@@ -1326,6 +1327,11 @@ interface_list
     unit->error("illegal inheritance from type Object");
     $$ = new ClassListTok; // Dummy
 }
+| ICE_VALUE
+{
+    unit->error("illegal inheritance from type Value");
+    $$ = new ClassListTok; // Dummy
+}
 ;
 
 // ----------------------------------------------------------------------
@@ -1350,7 +1356,7 @@ interface_exports
     ContainedPtr contained = ContainedPtr::dynamicCast($2);
     if(contained && !metaData->v.empty())
     {
-	contained->setMetaData(metaData->v);
+    contained->setMetaData(metaData->v);
     }
 }
 | error ';' interface_exports
@@ -1400,7 +1406,7 @@ exception
     ExceptionPtr exception = cont->lookupException(scoped->v);
     if(!exception)
     {
-	exception = cont->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy
+    exception = cont->createException(IceUtil::generateUUID(), 0, false, Dummy); // Dummy
     }
     cont->checkIntroduced(scoped->v, exception);
     $$ = exception;
@@ -1497,12 +1503,12 @@ enum_def
     EnumPtr en = EnumPtr::dynamicCast($3);
     if(en)
     {
-	EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast($5);
-	if(enumerators->v.empty())
-	{
-	    unit->error("enum `" + en->name() + "' must have at least one enumerator");
-	}
-	en->setEnumerators(enumerators->v); // Dummy
+    EnumeratorListTokPtr enumerators = EnumeratorListTokPtr::dynamicCast($5);
+    if(enumerators->v.empty())
+    {
+        unit->error("enum `" + en->name() + "' must have at least one enumerator");
+    }
+    en->setEnumerators(enumerators->v); // Dummy
     }
     $$ = $3;
 }
@@ -1544,7 +1550,7 @@ enumerator
     EnumeratorPtr en = cont->createEnumerator(ident->v);
     if(en)
     {
-	ens->v.push_front(en);
+    ens->v.push_front(en);
     }
     $$ = ens;
 }
@@ -1658,8 +1664,8 @@ parameters
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag);
-	unit->currentContainer()->checkIntroduced(tsp->v.name, pd);
+        ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag);
+        unit->currentContainer()->checkIntroduced(tsp->v.name, pd);
         StringListTokPtr metaData = StringListTokPtr::dynamicCast($2);
         if(!metaData->v.empty())
         {
@@ -1674,8 +1680,8 @@ parameters
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag);
-	unit->currentContainer()->checkIntroduced(tsp->v.name, pd);
+        ParamDeclPtr pd = op->createParamDecl(tsp->v.name, tsp->v.type, isOutParam->v, tsp->v.optional, tsp->v.tag);
+        unit->currentContainer()->checkIntroduced(tsp->v.name, pd);
         StringListTokPtr metaData = StringListTokPtr::dynamicCast($4);
         if(!metaData->v.empty())
         {
@@ -1691,8 +1697,8 @@ parameters
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy
-	unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
+        op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy
+        unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
     }
 }
 | parameters ',' out_qualifier meta_data type keyword
@@ -1703,8 +1709,8 @@ parameters
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy
-	unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
+        op->createParamDecl(ident->v, type, isOutParam->v, false, 0); // Dummy
+        unit->error("keyword `" + ident->v + "' cannot be used as parameter name");
     }
 }
 | out_qualifier meta_data type
@@ -1714,8 +1720,8 @@ parameters
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy
-	unit->error("missing parameter name");
+        op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy
+        unit->error("missing parameter name");
     }
 }
 | parameters ',' out_qualifier meta_data type
@@ -1725,8 +1731,8 @@ parameters
     OperationPtr op = OperationPtr::dynamicCast(unit->currentContainer());
     if(op)
     {
-	op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy
-	unit->error("missing parameter name");
+        op->createParamDecl(IceUtil::generateUUID(), type, isOutParam->v, false, 0); // Dummy
+        unit->error("missing parameter name");
     }
 }
 ;
@@ -1813,19 +1819,23 @@ type
 {
     $$ = unit->builtin(Builtin::KindLocalObject);
 }
+| ICE_VALUE
+{
+    $$ = unit->builtin(Builtin::KindValue);
+}
 | scoped_name
 {
     StringTokPtr scoped = StringTokPtr::dynamicCast($1);
     ContainerPtr cont = unit->currentContainer();
     if(cont)
     {
-	TypeList types = cont->lookupType(scoped->v);
-	if(types.empty())
-	{
-	    YYERROR; // Can't continue, jump to next yyerrok
-	}
-	cont->checkIntroduced(scoped->v);
-	$$ = types.front();
+        TypeList types = cont->lookupType(scoped->v);
+        if(types.empty())
+        {
+            YYERROR; // Can't continue, jump to next yyerrok
+        }
+        cont->checkIntroduced(scoped->v);
+        $$ = types.front();
     }
     else
     {
@@ -1838,30 +1848,30 @@ type
     ContainerPtr cont = unit->currentContainer();
     if(cont)
     {
-	TypeList types = cont->lookupType(scoped->v);
-	if(types.empty())
-	{
-	    YYERROR; // Can't continue, jump to next yyerrok
-	}
-	for(TypeList::iterator p = types.begin(); p != types.end(); ++p)
-	{
-	    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(*p);
-	    if(!cl)
-	    {
-		string msg = "`";
-		msg += scoped->v;
-		msg += "' must be class or interface";
-		unit->error(msg);
-		YYERROR; // Can't continue, jump to next yyerrok
-	    }
-	    cont->checkIntroduced(scoped->v);
-	    if(cl->isLocal())
-	    {
-		unit->error("cannot create proxy for " + cl->kindOf() + " `" + cl->name() + "'"); // $$ is dummy
-	    }
-	    *p = new Proxy(cl);
-	}
-	$$ = types.front();
+        TypeList types = cont->lookupType(scoped->v);
+        if(types.empty())
+        {
+            YYERROR; // Can't continue, jump to next yyerrok
+        }
+        for(TypeList::iterator p = types.begin(); p != types.end(); ++p)
+        {
+            ClassDeclPtr cl = ClassDeclPtr::dynamicCast(*p);
+            if(!cl)
+            {
+                string msg = "`";
+                msg += scoped->v;
+                msg += "' must be class or interface";
+                unit->error(msg);
+                YYERROR; // Can't continue, jump to next yyerrok
+            }
+            cont->checkIntroduced(scoped->v);
+            if(cl->isLocal())
+            {
+                unit->error("cannot create proxy for " + cl->kindOf() + " `" + cl->name() + "'"); // $$ is dummy
+            }
+            *p = new Proxy(cl);
+        }
+        $$ = types.front();
     }
     else
     {
@@ -1963,9 +1973,9 @@ const_initializer
     }
     else
     {
-	EnumeratorPtr enumerator = EnumeratorPtr::dynamicCast(cl.front());
+        EnumeratorPtr enumerator = EnumeratorPtr::dynamicCast(cl.front());
         ConstPtr constant = ConstPtr::dynamicCast(cl.front());
-	if(enumerator)
+        if(enumerator)
         {
             unit->currentContainer()->checkIntroduced(scoped->v, enumerator);
             def->v.type = enumerator->type();
@@ -1981,17 +1991,17 @@ const_initializer
             def->v.valueAsLiteral = constant->value();
         }
         else
-	{
-	    string msg = "illegal initializer: `" + scoped->v + "' is a";
-	    static const string vowels = "aeiou";
-	    string kindOf = cl.front()->kindOf();
-	    if(vowels.find_first_of(kindOf[0]) != string::npos)
-	    {
-	    	msg += "n";
-	    }
-	    msg += " " + kindOf;
-	    unit->error(msg); // $$ is dummy
-	}
+        {
+            string msg = "illegal initializer: `" + scoped->v + "' is a";
+            static const string vowels = "aeiou";
+            string kindOf = cl.front()->kindOf();
+            if(vowels.find_first_of(kindOf[0]) != string::npos)
+            {
+                msg += "n";
+            }
+            msg += " " + kindOf;
+            unit->error(msg); // $$ is dummy
+        }
     }
     $$ = def;
 }
@@ -2143,6 +2153,9 @@ keyword
 | ICE_OPTIONAL
 {
 }
+| ICE_VALUE
+{
+}
 ;
 
 %%
diff --git a/cpp/src/Slice/JavaUtil.cpp b/cpp/src/Slice/JavaUtil.cpp
index 3e27a14e5ee..ff3953444bc 100644
--- a/cpp/src/Slice/JavaUtil.cpp
+++ b/cpp/src/Slice/JavaUtil.cpp
@@ -650,6 +650,10 @@ Slice::JavaGenerator::getOptionalFormat(const TypePtr& type)
             assert(false);
             break;
         }
+        case Builtin::KindValue:
+        {
+            return "Ice.OptionalFormat.Class";
+        }
         }
     }
 
@@ -765,6 +769,7 @@ Slice::JavaGenerator::typeToString(const TypePtr& type,
                 case Builtin::KindObject:
                 case Builtin::KindObjectProxy:
                 case Builtin::KindLocalObject:
+                case Builtin::KindValue:
                 {
                     break;
                 }
@@ -1157,6 +1162,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
                 break;
             }
             case Builtin::KindObject:
+            case Builtin::KindValue:
             {
                 if(marshal)
                 {
@@ -1670,6 +1676,7 @@ Slice::JavaGenerator::writeMarshalUnmarshalCode(Output& out,
                         }
                         return;
                     }
+                    case Builtin::KindValue:
                     case Builtin::KindObject:
                     case Builtin::KindObjectProxy:
                     case Builtin::KindLocalObject:
@@ -2153,6 +2160,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                 case Builtin::KindObject:
                 case Builtin::KindObjectProxy:
                 case Builtin::KindLocalObject:
+                case Builtin::KindValue:
                 {
                     assert(false);
                     break;
@@ -2428,6 +2436,7 @@ Slice::JavaGenerator::writeSequenceMarshalUnmarshalCode(Output& out,
                     }
                     break;
                 }
+                case Builtin::KindValue:
                 case Builtin::KindObject:
                 case Builtin::KindObjectProxy:
                 case Builtin::KindLocalObject:
@@ -2678,6 +2687,7 @@ Slice::JavaGenerator::writeStreamMarshalUnmarshalCode(Output& out,
                 }
                 break;
             }
+            case Builtin::KindValue:
             case Builtin::KindObject:
             {
                 if(marshal)
@@ -3343,6 +3353,7 @@ Slice::JavaGenerator::writeStreamSequenceMarshalUnmarshalCode(Output& out,
                 case Builtin::KindObject:
                 case Builtin::KindObjectProxy:
                 case Builtin::KindLocalObject:
+                case Builtin::KindValue:
                 {
                     assert(false);
                     break;
@@ -3618,6 +3629,7 @@ Slice::JavaGenerator::writeStreamSequenceMarshalUnmarshalCode(Output& out,
                 case Builtin::KindObject:
                 case Builtin::KindObjectProxy:
                 case Builtin::KindLocalObject:
+                case Builtin::KindValue:
                 {
                     assert(false);
                     break;
diff --git a/cpp/src/Slice/ObjCUtil.cpp b/cpp/src/Slice/ObjCUtil.cpp
index 77a2d627ece..2f2f39c1c61 100644
--- a/cpp/src/Slice/ObjCUtil.cpp
+++ b/cpp/src/Slice/ObjCUtil.cpp
@@ -633,6 +633,7 @@ Slice::ObjCGenerator::getOptionalFormat(const TypePtr& type)
             return "ICEOptionalFormatVSize";
         }
         case Builtin::KindObject:
+        case Builtin::KindValue:
         {
             return "ICEOptionalFormatClass";
         }
diff --git a/cpp/src/Slice/Parser.cpp b/cpp/src/Slice/Parser.cpp
index 07df9c2f75e..c40ac42c544 100644
--- a/cpp/src/Slice/Parser.cpp
+++ b/cpp/src/Slice/Parser.cpp
@@ -258,6 +258,11 @@ Slice::Builtin::typeId() const
             return "::Ice::LocalObject";
             break;
         }
+        case KindValue:
+        {
+            return "::Ice::Value";
+            break;
+        }
     }
     assert(false);
     return ""; // Keep the compiler happy.
@@ -266,7 +271,7 @@ Slice::Builtin::typeId() const
 bool
 Slice::Builtin::usesClasses() const
 {
-    return _kind == KindObject;
+    return _kind == KindObject || _kind == KindValue;
 }
 
 size_t
@@ -283,7 +288,8 @@ Slice::Builtin::minWireSize() const
         8, // KindDouble
         1, // KindString: at least one byte for an empty string.
         1, // KindObject: at least one byte (to marshal an index instead of an instance).
-        2  // KindObjectProxy: at least an empty identity for a nil proxy, that is, 2 bytes.
+        2, // KindObjectProxy: at least an empty identity for a nil proxy, that is, 2 bytes.
+        1  // KindValue: at least one byte (to marshal an index instead of an instance).
     };
 
     assert(_kind != KindLocalObject);
@@ -293,7 +299,7 @@ Slice::Builtin::minWireSize() const
 bool
 Slice::Builtin::isVariableLength() const
 {
-    return _kind == KindString || _kind == KindObject || _kind == KindObjectProxy;
+    return _kind == KindString || _kind == KindObject || _kind == KindObjectProxy || _kind == KindValue;
 }
 
 Builtin::Kind
@@ -320,7 +326,8 @@ const char* Slice::Builtin::builtinTable[] =
         "string",
         "Object",
         "Object*",
-        "LocalObject"
+        "LocalObject",
+        "Value"
     };
 
 Slice::Builtin::Builtin(const UnitPtr& unit, Kind kind) :
@@ -408,7 +415,7 @@ Slice::Contained::updateIncludeLevel()
 
 bool
 Slice::Contained::hasMetaData(const string& meta) const
-{
+{        
     return find(_metaData.begin(), _metaData.end(), meta) != _metaData.end();
 }
 
@@ -876,17 +883,6 @@ Slice::Container::createSequence(const string& name, const TypePtr& type, const
 {
     checkIdentifier(name);
 
-    if(_unit->profile() == IceE && !local)
-    {
-        BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
-        if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(type))
-        {
-            string msg = "Sequence `" + name + "' cannot contain object values.";
-            _unit->error(msg);
-            return 0;
-        }
-    }
-
     ContainedList matches = _unit->findContents(thisScope() + name);
     if(!matches.empty())
     {
@@ -942,17 +938,6 @@ Slice::Container::createDictionary(const string& name, const TypePtr& keyType, c
 {
     checkIdentifier(name);
 
-    if(_unit->profile() == IceE && !local)
-    {
-        BuiltinPtr builtin = BuiltinPtr::dynamicCast(valueType);
-        if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(valueType))
-        {
-            string msg = "Dictionary `" + name + "' cannot contain object values.";
-            _unit->error(msg);
-            return 0;
-        }
-    }
-
     ContainedList matches = _unit->findContents(thisScope() + name);
     if(!matches.empty())
     {
@@ -1762,6 +1747,66 @@ Slice::Container::hasClassDefs() const
 }
 
 bool
+Slice::Container::hasLocalClassDefs() const
+{
+    for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
+    {
+        ClassDefPtr cl = ClassDefPtr::dynamicCast(*p);
+        if(cl && cl->isLocal())
+        {
+            return true;
+        }
+
+        ContainerPtr container = ContainerPtr::dynamicCast(*p);
+        if(container && container->hasLocalClassDefs())
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool
+Slice::Container::hasNonLocalInterfaceDefs() const
+{
+    for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
+    {
+        ClassDefPtr cl = ClassDefPtr::dynamicCast(*p);
+        if(cl && !cl->isLocal() && (cl->isInterface() || !cl->allOperations().empty()))
+        {
+            return true;
+        }
+
+        ContainerPtr container = ContainerPtr::dynamicCast(*p);
+        if(container && container->hasNonLocalInterfaceDefs())
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool
+Slice::Container::hasValueDefs() const
+{
+    for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
+    {
+        ClassDefPtr cl = ClassDefPtr::dynamicCast(*p);
+        if(cl && !cl->isLocal() && !cl->isInterface())
+        {
+            return true;
+        }
+
+        ContainerPtr container = ContainerPtr::dynamicCast(*p);
+        if(container && container->hasValueDefs())
+        {
+            return true;
+        }
+    }
+    return false;
+}
+
+bool
 Slice::Container::hasOnlyClassDecls() const
 {
     for(ContainedList::const_iterator p = _contents.begin(); p != _contents.end(); ++p)
@@ -2562,6 +2607,7 @@ Slice::Container::validateConstant(const string& name, const TypePtr& type, cons
                 case Builtin::KindObject:
                 case Builtin::KindObjectProxy:
                 case Builtin::KindLocalObject:
+                case Builtin::KindValue:
                 {
                     assert(false);
                     break;
@@ -3186,28 +3232,6 @@ Slice::ClassDef::createDataMember(const string& name, const TypePtr& type, bool
 {
     checkIdentifier(name);
 
-    if(_unit->profile() == IceE)
-    {
-        if(!isLocal())
-        {
-            BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
-            if((builtin && builtin->kind() == Builtin::KindObject))
-            {
-                string msg = "Class data member `" + name + "' cannot be a value object.";
-                _unit->error(msg);
-                return 0;
-            }
-
-            ClassDeclPtr classDecl = ClassDeclPtr::dynamicCast(type);
-            if(classDecl != 0 && !classDecl->isLocal())
-            {
-                string msg = "Class data member `" + name + "' cannot be a value object.";
-                _unit->error(msg);
-                return 0;
-            }
-        }
-    }
-
     assert(!isInterface());
     ContainedList matches = _unit->findContents(thisScope() + name);
     if(!matches.empty())
@@ -3443,7 +3467,9 @@ Slice::ClassDef::classDataMembers() const
         if(q)
         {
             BuiltinPtr builtin = BuiltinPtr::dynamicCast(q->type());
-            if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(q->type()))
+            if((builtin && builtin->kind() == Builtin::KindObject) || 
+               (builtin && builtin->kind() == Builtin::KindValue) ||
+               ClassDeclPtr::dynamicCast(q->type()))
             {
                 result.push_back(q);
             }
@@ -3726,28 +3752,6 @@ Slice::Exception::createDataMember(const string& name, const TypePtr& type, bool
 {
     checkIdentifier(name);
 
-    if(_unit->profile() == IceE)
-    {
-        if(!isLocal())
-        {
-            BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
-            if((builtin && builtin->kind() == Builtin::KindObject))
-            {
-                string msg = "Exception data member `" + name + "' cannot be a value object.";
-                _unit->error(msg);
-                return 0;
-            }
-
-            ClassDeclPtr classDecl = ClassDeclPtr::dynamicCast(type);
-            if(classDecl != 0 && !classDecl->isLocal())
-            {
-                string msg = "Exception data member `" + name + "' cannot be a value object.";
-                _unit->error(msg);
-                return 0;
-            }
-        }
-    }
-
     ContainedList matches = _unit->findContents(thisScope() + name);
     if(!matches.empty())
     {
@@ -3912,7 +3916,9 @@ Slice::Exception::classDataMembers() const
         if(q)
         {
             BuiltinPtr builtin = BuiltinPtr::dynamicCast(q->type());
-            if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(q->type()))
+            if((builtin && builtin->kind() == Builtin::KindObject) ||
+               (builtin && builtin->kind() == Builtin::KindValue) ||
+               ClassDeclPtr::dynamicCast(q->type()))
             {
                 result.push_back(q);
             }
@@ -4082,27 +4088,6 @@ Slice::Struct::createDataMember(const string& name, const TypePtr& type, bool op
 {
     checkIdentifier(name);
 
-    if(_unit->profile() == IceE)
-    {
-        if(!isLocal())
-        {
-            BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
-            if((builtin && builtin->kind() == Builtin::KindObject))
-            {
-                string msg = "Struct data member `" + name + "' cannot be a value object.";
-                _unit->error(msg);
-                return 0;
-            }
-            ClassDeclPtr classDecl = ClassDeclPtr::dynamicCast(type);
-            if(classDecl != 0 && !classDecl->isLocal())
-            {
-                string msg = "Struct data member `" + name + "' cannot be a value object.";
-                _unit->error(msg);
-                return 0;
-            }
-        }
-    }
-
     ContainedList matches = _unit->findContents(thisScope() + name);
     if(!matches.empty())
     {
@@ -4217,7 +4202,9 @@ Slice::Struct::classDataMembers() const
         if(q)
         {
             BuiltinPtr builtin = BuiltinPtr::dynamicCast(q->type());
-            if((builtin && builtin->kind() == Builtin::KindObject) || ClassDeclPtr::dynamicCast(q->type()))
+            if((builtin && builtin->kind() == Builtin::KindObject) ||
+               (builtin && builtin->kind() == Builtin::KindValue) ||
+               ClassDeclPtr::dynamicCast(q->type()))
             {
                 result.push_back(q);
             }
@@ -4556,6 +4543,7 @@ Slice::Dictionary::legalKeyType(const TypePtr& type, bool& containsSequence)
             case Builtin::KindObject:
             case Builtin::KindObjectProxy:
             case Builtin::KindLocalObject:
+            case Builtin::KindValue:
             {
                 return false;
                 break;
@@ -4933,29 +4921,6 @@ Slice::Operation::createParamDecl(const string& name, const TypePtr& type, bool
 {
     checkIdentifier(name);
 
-    if(_unit->profile() == IceE)
-    {
-        ClassDefPtr cl = ClassDefPtr::dynamicCast(this->container());
-        assert(cl);
-        if(!cl->isLocal())
-        {
-            BuiltinPtr builtin = BuiltinPtr::dynamicCast(type);
-            if((builtin && builtin->kind() == Builtin::KindObject))
-            {
-                string msg = "Object `" + name + "' cannot be passed by value.";
-                _unit->error(msg);
-                return 0;
-            }
-            ClassDeclPtr classDecl =  ClassDeclPtr::dynamicCast(type);
-            if(classDecl != 0 && !classDecl->isLocal())
-            {
-                string msg = "Object `" + name + "' cannot be passed by value.";
-                _unit->error(msg);
-                return 0;
-            }
-        }
-    }
-
     ContainedList matches = _unit->findContents(thisScope() + name);
     if(!matches.empty())
     {
@@ -5343,26 +5308,6 @@ Slice::Operation::Operation(const ContainerPtr& container,
     _returnTag(returnTag),
     _mode(mode)
 {
-    if(_unit->profile() == IceE)
-    {
-        ClassDefPtr cl = ClassDefPtr::dynamicCast(this->container());
-        assert(cl);
-        if(!cl->isLocal())
-        {
-            BuiltinPtr builtin = BuiltinPtr::dynamicCast(returnType);
-            if((builtin && builtin->kind() == Builtin::KindObject))
-            {
-                string msg = "Method `" + name + "' cannot return an object by value.";
-                _unit->error(msg);
-            }
-            ClassDeclPtr classDecl = ClassDeclPtr::dynamicCast(returnType);
-            if(classDecl != 0 && !classDecl->isLocal())
-            {
-                string msg = "Method `" + name + "' cannot return an object by value.";
-                _unit->error(msg);
-            }
-        }
-    }
 }
 
 // ----------------------------------------------------------------------
@@ -6025,6 +5970,11 @@ Slice::Unit::usesNonLocals() const
         return true;
     }
 
+    if(_builtins.find(Builtin::KindValue) != _builtins.end())
+    {
+        return true;
+    }
+
     return false;
 }
 
diff --git a/cpp/src/Slice/PythonUtil.cpp b/cpp/src/Slice/PythonUtil.cpp
index adeffc18a40..14d5428e20e 100644
--- a/cpp/src/Slice/PythonUtil.cpp
+++ b/cpp/src/Slice/PythonUtil.cpp
@@ -1643,6 +1643,7 @@ Slice::Python::CodeVisitor::writeType(const TypePtr& p)
                 break;
             }
             case Builtin::KindObject:
+            case Builtin::KindValue:
             {
                 _out << "IcePy._t_Object";
                 break;
@@ -1706,6 +1707,7 @@ Slice::Python::CodeVisitor::writeInitializer(const DataMemberPtr& m)
                 _out << "''";
                 break;
             }
+            case Builtin::KindValue:
             case Builtin::KindObject:
             case Builtin::KindObjectProxy:
             case Builtin::KindLocalObject:
@@ -1943,6 +1945,7 @@ Slice::Python::CodeVisitor::writeConstantValue(const TypePtr& type, const Syntax
                 _out << "\"";                                   // Closing "
                 break;
             }
+            case Slice::Builtin::KindValue:
             case Slice::Builtin::KindObject:
             case Slice::Builtin::KindObjectProxy:
             case Slice::Builtin::KindLocalObject:
diff --git a/cpp/src/Slice/RubyUtil.cpp b/cpp/src/Slice/RubyUtil.cpp
index bc90db3f1b3..393aa565593 100644
--- a/cpp/src/Slice/RubyUtil.cpp
+++ b/cpp/src/Slice/RubyUtil.cpp
@@ -1331,6 +1331,7 @@ Slice::Ruby::CodeVisitor::writeType(const TypePtr& p)
                 _out << "::Ice::T_string";
                 break;
             }
+            case Builtin::KindValue:
             case Builtin::KindObject:
             {
                 _out << "::Ice::T_Object";
@@ -1391,6 +1392,7 @@ Slice::Ruby::CodeVisitor::getInitializer(const DataMemberPtr& m)
             {
                 return "''";
             }
+            case Builtin::KindValue:
             case Builtin::KindObject:
             case Builtin::KindObjectProxy:
             case Builtin::KindLocalObject:
@@ -1535,6 +1537,7 @@ Slice::Ruby::CodeVisitor::writeConstantValue(const TypePtr& type, const SyntaxTr
                 break;
             }
 
+            case Slice::Builtin::KindValue:
             case Slice::Builtin::KindObject:
             case Slice::Builtin::KindObjectProxy:
             case Slice::Builtin::KindLocalObject:
diff --git a/cpp/src/Slice/Scanner.cpp b/cpp/src/Slice/Scanner.cpp
index 69859b0090e..7ca48429def 100644
--- a/cpp/src/Slice/Scanner.cpp
+++ b/cpp/src/Slice/Scanner.cpp
@@ -29,7 +29,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 35
+#define YY_FLEX_SUBMINOR_VERSION 39
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -74,7 +74,6 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -105,6 +104,8 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! C99 */
+
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -161,7 +162,15 @@ typedef unsigned int flex_uint32_t;
 
 /* Size of default input buffer. */
 #ifndef YY_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k.
+ * Moreover, YY_BUF_SIZE is 2*YY_READ_BUF_SIZE in the general case.
+ * Ditto for the __ia64__ case accordingly.
+ */
+#define YY_BUF_SIZE 32768
+#else
 #define YY_BUF_SIZE 16384
+#endif /* __ia64__ */
 #endif
 
 /* The state buf must be large enough to hold one state per character in the main buffer.
@@ -173,7 +182,12 @@ typedef unsigned int flex_uint32_t;
 typedef struct yy_buffer_state *YY_BUFFER_STATE;
 #endif
 
-extern int slice_leng;
+#ifndef YY_TYPEDEF_YY_SIZE_T
+#define YY_TYPEDEF_YY_SIZE_T
+typedef size_t yy_size_t;
+#endif
+
+extern yy_size_t slice_leng;
 
 extern FILE *slice_in, *slice_out;
 
@@ -182,6 +196,7 @@ extern FILE *slice_in, *slice_out;
 #define EOB_ACT_LAST_MATCH 2
 
     #define YY_LESS_LINENO(n)
+    #define YY_LINENO_REWIND_TO(ptr)
     
 /* Return all but the first "n" matched characters back to the input stream. */
 #define yyless(n) \
@@ -199,11 +214,6 @@ extern FILE *slice_in, *slice_out;
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
-#ifndef YY_TYPEDEF_YY_SIZE_T
-#define YY_TYPEDEF_YY_SIZE_T
-typedef size_t yy_size_t;
-#endif
-
 #ifndef YY_STRUCT_YY_BUFFER_STATE
 #define YY_STRUCT_YY_BUFFER_STATE
 struct yy_buffer_state
@@ -221,7 +231,7 @@ struct yy_buffer_state
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	int yy_n_chars;
+	yy_size_t yy_n_chars;
 
 	/* Whether we "own" the buffer - i.e., we know we created it,
 	 * and can realloc() it to grow it, and should free() it to
@@ -291,8 +301,8 @@ static YY_BUFFER_STATE * yy_buffer_stack = 0; /**< Stack as an array. */
 
 /* yy_hold_char holds the character lost when slice_text is formed. */
 static char yy_hold_char;
-static int yy_n_chars;		/* number of characters read into yy_ch_buf */
-int slice_leng;
+static yy_size_t yy_n_chars;		/* number of characters read into yy_ch_buf */
+yy_size_t slice_leng;
 
 /* Points to current character in buffer. */
 static char *yy_c_buf_p = (char *) 0;
@@ -320,7 +330,7 @@ static void slice__init_buffer (YY_BUFFER_STATE b,FILE *file  );
 
 YY_BUFFER_STATE slice__scan_buffer (char *base,yy_size_t size  );
 YY_BUFFER_STATE slice__scan_string (yyconst char *yy_str  );
-YY_BUFFER_STATE slice__scan_bytes (yyconst char *bytes,int len  );
+YY_BUFFER_STATE slice__scan_bytes (yyconst char *bytes,yy_size_t len  );
 
 void *slice_alloc (yy_size_t  );
 void *slice_realloc (void *,yy_size_t  );
@@ -352,7 +362,7 @@ void slice_free (void *  );
 
 /* Begin user sect3 */
 
-#define slice_wrap(n) 1
+#define slice_wrap() 1
 #define YY_SKIP_YYWRAP
 
 typedef unsigned char YY_CHAR;
@@ -554,7 +564,7 @@ char *slice_text;
 //
 // **********************************************************************
 
-#include <Slice/GrammarUtil.h>	// Before Grammer.h, so that YYSTYPE is defined
+#include <Slice/GrammarUtil.h>  // Before Grammer.h, so that YYSTYPE is defined
 #include <Slice/Grammar.h>
 #include <IceUtil/InputUtil.h>
 
@@ -595,7 +605,7 @@ char *slice_text;
 #      define slice_wrap() 1
 #   endif
 #   ifdef ICE_64
-#       pragma error_messages(off,truncwarn)      
+#       pragma error_messages(off,truncwarn)
 #   endif
 #endif
 
@@ -608,7 +618,7 @@ namespace Slice
 //
 // Definitions for the case-insensitive keyword-token map.
 //
-typedef std::map<std::string, int, Slice::CICompare> StringTokenMap;
+typedef std::map<std::string, int> StringTokenMap;
 static StringTokenMap keywordMap;
 
 void initScanner();
@@ -616,11 +626,11 @@ int checkKeyword(string&);
 
 }
 
-#define	YY_USER_INIT initScanner();
+#define YY_USER_INIT initScanner();
 
 
 
-#line 623 "lex.yy.c"
+#line 633 "lex.yy.c"
 
 #define INITIAL 0
 #define BOMSCAN 1
@@ -661,7 +671,7 @@ FILE *slice_get_out (void );
 
 void slice_set_out  (FILE * out_str  );
 
-int slice_get_leng (void );
+yy_size_t slice_get_leng (void );
 
 char *slice_get_text (void );
 
@@ -703,7 +713,12 @@ static int input (void );
 
 /* Amount of stuff to slurp up with each read. */
 #ifndef YY_READ_BUF_SIZE
+#ifdef __ia64__
+/* On IA-64, the buffer size is 16k, not 8k */
+#define YY_READ_BUF_SIZE 16384
+#else
 #define YY_READ_BUF_SIZE 8192
+#endif /* __ia64__ */
 #endif
 
 /* Copy whatever the last rule matched to the standard output. */
@@ -722,7 +737,7 @@ static int input (void );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		unsigned n; \
+		size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( slice_in )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -807,11 +822,6 @@ YY_DECL
 	register char *yy_cp, *yy_bp;
 	register int yy_act;
     
-#line 92 "Scanner.l"
-
-
-#line 813 "lex.yy.c"
-
 	if ( !(yy_init) )
 		{
 		(yy_init) = 1;
@@ -838,6 +848,12 @@ YY_DECL
 		slice__load_buffer_state( );
 		}
 
+	{
+#line 92 "Scanner.l"
+
+
+#line 855 "lex.yy.c"
+
 	while ( 1 )		/* loops until end-of-file is reached */
 		{
 		yy_cp = (yy_c_buf_p);
@@ -855,7 +871,7 @@ YY_DECL
 yy_match:
 		do
 			{
-			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)];
+			register YY_CHAR yy_c = yy_ec[YY_SC_TO_UI(*yy_cp)] ;
 			if ( yy_accept[yy_current_state] )
 				{
 				(yy_last_accepting_state) = yy_current_state;
@@ -906,6 +922,7 @@ YY_RULE_SETUP
 case 2:
 /* rule 2 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up slice_text */
+YY_LINENO_REWIND_TO(yy_cp - 1);
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up slice_text again */
 YY_RULE_SETUP
@@ -933,6 +950,7 @@ YY_RULE_SETUP
 case 4:
 /* rule 4 can match eol */
 *yy_cp = (yy_hold_char); /* undo effects of setting up slice_text */
+YY_LINENO_REWIND_TO(yy_cp - 1);
 (yy_c_buf_p) = yy_cp -= 1;
 YY_DO_BEFORE_ACTION; /* set up slice_text again */
 YY_RULE_SETUP
@@ -953,11 +971,11 @@ YY_RULE_SETUP
     int c;
     do
     {
-	c = yyinput();
-	if(c == '\n')
-	{
-	    unit->nextLine();
-	}
+        c = yyinput();
+        if(c == '\n')
+        {
+            unit->nextLine();
+        }
     }
     while(c != '\n' && c != EOF);
 }
@@ -971,38 +989,38 @@ YY_RULE_SETUP
     string comment = slice_text + 2;
     while(true)
     {
-	int c = yyinput();
-	if(c == '\n')
-	{
-	    comment += static_cast<char>(c);
-	    unit->nextLine();
-	}
-	else if(c == '*')
-	{
-	    int next = yyinput();
-	    if(next == '/')
-	    {
-		break;
-	    }
-	    else
-	    {
-		comment += static_cast<char>(c);
-		unput(next);
-	    }
-	}
-	else if(c == EOF)
-	{
-	    unit->warning("EOF in comment");
-	    break;
-	}
-	else
-	{
-	    comment += static_cast<char>(c);
-	}
+        int c = yyinput();
+        if(c == '\n')
+        {
+            comment += static_cast<char>(c);
+            unit->nextLine();
+        }
+        else if(c == '*')
+        {
+            int next = yyinput();
+            if(next == '/')
+            {
+                break;
+            }
+            else
+            {
+                comment += static_cast<char>(c);
+                unput(next);
+            }
+        }
+        else if(c == EOF)
+        {
+            unit->warning("EOF in comment");
+            break;
+        }
+        else
+        {
+            comment += static_cast<char>(c);
+        }
     }
     if(!comment.empty() && comment[0] == '*')
     {
-	unit->setComment(comment);
+        unit->setComment(comment);
     }
 }
 	YY_BREAK
@@ -1095,156 +1113,149 @@ YY_RULE_SETUP
     str->literal = "\"";
     while(true)
     {
-	char c = static_cast<char>(yyinput());
+        char c = static_cast<char>(yyinput());
         str->literal += c;
-	if(c == '"')
-	{
-	    break;
-	}
-	else if(c == EOF)
-	{
-	    unit->error("EOF in string");
-	    break;
-	}
-	else if(c == '\n')
-	{
-	    unit->error("newline in string");
-	}
-	else if(c == '\\')
-	{
-	    char next = static_cast<char>(yyinput());
+        if(c == '"')
+        {
+            break;
+        }
+        else if(c == EOF)
+        {
+            unit->error("EOF in string");
+            break;
+        }
+        else if(c == '\n')
+        {
+            unit->error("newline in string");
+        }
+        else if(c == '\\')
+        {
+            char next = static_cast<char>(yyinput());
             str->literal += next;
-	    switch(next)
-	    {
-		case '\\':
-		case '"':
-		case '\'':
-		{
-		    str->v += next;
-		    break;
-		}
-	    
-		case 'n':
-		{
-		    str->v += '\n';
-		    break;
-		}
-	    
-		case 'r':
-		{
-		    str->v += '\r';
-		    break;
-		}
-
-		case 't':
-		{
-		    str->v += '\t';
-		    break;
-		}
-	    
-		case 'v':
-		{
-		    str->v += '\v';
-		    break;
-		}
-	    
-		case 'f':
-		{
-		    str->v += '\f';
-		    break;
-		}
-
-		case 'a':
-		{
-		    str->v += '\a';
-		    break;
-		}
-
-		case 'b':
-		{
-		    str->v += '\b';
-		    break;
-		}
-
-		case '?':
-		{
-		    str->v += '\?';
-		    break;
-		}
-
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-		{
-		    static string octalDigits = "01234567";
-		    unsigned short us = next - '0';
-		    if(octalDigits.find_first_of(next = static_cast<char>(yyinput())) != string::npos)
-		    {
+            switch(next)
+            {
+                case '\\':
+                case '"':
+                case '\'':
+                {
+                    str->v += next;
+                    break;
+                }
+                case 'n':
+                {
+                    str->v += '\n';
+                    break;
+                }
+                case 'r':
+                {
+                    str->v += '\r';
+                    break;
+                }
+                case 't':
+                {
+                    str->v += '\t';
+                    break;
+                }
+                case 'v':
+                {
+                    str->v += '\v';
+                    break;
+                }
+                case 'f':
+                {
+                    str->v += '\f';
+                    break;
+                }
+
+                case 'a':
+                {
+                    str->v += '\a';
+                    break;
+                }
+
+                case 'b':
+                {
+                    str->v += '\b';
+                    break;
+                }
+
+                case '?':
+                {
+                    str->v += '\?';
+                    break;
+                }
+
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                {
+                    static string octalDigits = "01234567";
+                    unsigned short us = next - '0';
+                    if(octalDigits.find_first_of(next = static_cast<char>(yyinput())) != string::npos)
+                    {
                         str->literal += next;
-		    	us = us * 8 + next - '0';
-			if(octalDigits.find_first_of(next = static_cast<char>(yyinput())) != string::npos)
-			{
-			    us = us * 8 + next - '0';
-			}
-			else
-			{
-			    unput(next);
-			}
-		    }
-		    else
-		    {
-		    	unput(next);
-		    }
-		    if(us == 0)
-		    {
-			unit->error("illegal NUL character in string constant");
-		    }
-		    str->v += static_cast<char>(us);
-		    break;
-		}
-		case 'x':
-		{
-		    IceUtil::Int64 ull = 0;
-		    while(isxdigit(static_cast<unsigned char>(next = static_cast<char>(yyinput()))))
-		    {
+                        us = us * 8 + next - '0';
+                        if(octalDigits.find_first_of(next = static_cast<char>(yyinput())) != string::npos)
+                        {
+                            us = us * 8 + next - '0';
+                        }
+                        else
+                        {
+                            unput(next);
+                        }
+                    }
+                    else
+                    {
+                        unput(next);
+                    }
+                    if(us == 0)
+                    {
+                        unit->error("illegal NUL character in string constant");
+                    }
+                    str->v += static_cast<char>(us);
+                    break;
+                }
+                case 'x':
+                {
+                    IceUtil::Int64 ull = 0;
+                    while(isxdigit(static_cast<unsigned char>(next = static_cast<char>(yyinput()))))
+                    {
                         str->literal += next;
-			ull *= 16;
-			if(isdigit(static_cast<unsigned char>(next)))
-			{
-			    ull += next - '0';
-			}
-			else if(islower(static_cast<unsigned char>(next)))
-			{
-			    ull += next - 'a' + 10;
-			}
-			else
-			{
-			    ull += next - 'A' + 10;
-			}
-		    }
-		    unput(next);
-		    if(ull == 0)
-		    {
-			unit->error("illegal NUL character in string constant");
-		    }
-		    str->v += static_cast<char>(ull);
-		    break;
-		}
-	
-		// TODO: add universal character names
-	    
-		default:
-		{
-		    str->v += c;
-		    unput(next);
-		}
-	    }
-	}
-	else
-	{
-	    str->v += c;
-	}
+                        ull *= 16;
+                        if(isdigit(static_cast<unsigned char>(next)))
+                        {
+                            ull += next - '0';
+                        }
+                        else if(islower(static_cast<unsigned char>(next)))
+                        {
+                            ull += next - 'a' + 10;
+                        }
+                        else
+                        {
+                            ull += next - 'A' + 10;
+                        }
+                    }
+                    unput(next);
+                    if(ull == 0)
+                    {
+                        unit->error("illegal NUL character in string constant");
+                    }
+                    str->v += static_cast<char>(ull);
+                    break;
+                }
+                // TODO: add universal character names
+                default:
+                {
+                    str->v += c;
+                    unput(next);
+                }
+            }
+        }
+        else
+        {
+            str->v += c;
+        }
     }
     *yylvalp = str;
     return ICE_STRING_LITERAL;
@@ -1252,7 +1263,7 @@ YY_RULE_SETUP
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 397 "Scanner.l"
+#line 390 "Scanner.l"
 {
     BEGIN(MAINSCAN);
     IntegerTokPtr itp = new IntegerTok;
@@ -1260,18 +1271,18 @@ YY_RULE_SETUP
     *yylvalp = itp;
     if(!IceUtilInternal::stringToInt64(string(slice_text), itp->v))
     {
-	assert(itp->v != 0);
-	string msg = "integer constant `";
-	msg += slice_text;
-	msg += "' out of range";
-	unit->error(msg);
+        assert(itp->v != 0);
+        string msg = "integer constant `";
+        msg += slice_text;
+        msg += "' out of range";
+        unit->error(msg);
     }
     return ICE_INTEGER_LITERAL;
 }
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 413 "Scanner.l"
+#line 406 "Scanner.l"
 {
     BEGIN(MAINSCAN);
     errno = 0;
@@ -1282,22 +1293,22 @@ YY_RULE_SETUP
     char lastChar = literal[literal.size() - 1];
     if(lastChar == 'f' || lastChar == 'F')
     {
-    	literal = literal.substr(0, literal.size() - 1);	// Clobber trailing 'f' or 'F' suffix
+        literal = literal.substr(0, literal.size() - 1);    // Clobber trailing 'f' or 'F' suffix
     }
     ftp->v = strtod(literal.c_str(), 0);
     if((ftp->v == HUGE_VAL || ftp->v == -HUGE_VAL) && errno == ERANGE)
     {
-	string msg = "floating-point constant `";
-	msg += slice_text;
-	msg += "' too large (overflow)";
-	unit->error(msg);
+        string msg = "floating-point constant `";
+        msg += slice_text;
+        msg += "' too large (overflow)";
+        unit->error(msg);
     }
     else if(ftp->v == 0 && errno == ERANGE)
     {
-	string msg = "floating-point constant `";
-	msg += slice_text;
-	msg += "' too small (underflow)";
-	unit->error(msg);
+        string msg = "floating-point constant `";
+        msg += slice_text;
+        msg += "' too small (underflow)";
+    unit->error(msg);
     }
     return ICE_FLOATING_POINT_LITERAL;
 }
@@ -1305,54 +1316,54 @@ YY_RULE_SETUP
 case 17:
 /* rule 17 can match eol */
 YY_RULE_SETUP
-#line 443 "Scanner.l"
+#line 436 "Scanner.l"
 {
     // Ignore white-space
-    
+
     if(unit->currentLine() != 0)
     {
         BEGIN(MAINSCAN);
     }
     if(slice_text[0] == '\n')
     {
-	unit->nextLine();
+        unit->nextLine();
     }
 }
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 456 "Scanner.l"
+#line 449 "Scanner.l"
 {
     // Ignore UTF-8 BOM, rule only active when parsing start of file.
-    
+
     BEGIN(MAINSCAN);
 }
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 462 "Scanner.l"
+#line 455 "Scanner.l"
 {
     BEGIN(MAINSCAN);
     if(slice_text[0] < 32 || slice_text[0] > 126)
     {
-	stringstream s;
-	s << "illegal input character: '\\";
-	s.width(3);
-	s.fill('0');
-	s << oct << static_cast<int>(static_cast<unsigned char>(slice_text[0]));
-	s << "'";
-	unit->error(s.str());
-	return BAD_CHAR;
+        stringstream s;
+        s << "illegal input character: '\\";
+        s.width(3);
+        s.fill('0');
+        s << oct << static_cast<int>(static_cast<unsigned char>(slice_text[0]));
+        s << "'";
+        unit->error(s.str());
+        return BAD_CHAR;
     }
     return slice_text[0];
 }
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 478 "Scanner.l"
+#line 471 "Scanner.l"
 ECHO;
 	YY_BREAK
-#line 1355 "lex.yy.c"
+#line 1366 "lex.yy.c"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(BOMSCAN):
 case YY_STATE_EOF(MAINSCAN):
@@ -1486,6 +1497,7 @@ case YY_STATE_EOF(MAINSCAN):
 			"fatal flex scanner internal error--no action found" );
 	} /* end of action switch */
 		} /* end of scanning one token */
+	} /* end of user's declarations */
 } /* end of slice_lex */
 
 /* yy_get_next_buffer - try to read in a new buffer
@@ -1541,21 +1553,21 @@ static int yy_get_next_buffer (void)
 
 	else
 		{
-			int num_to_read =
+			yy_size_t num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
 			{ /* Not enough room in the buffer - grow it. */
 
 			/* just a shorter name for the current buffer */
-			YY_BUFFER_STATE b = YY_CURRENT_BUFFER;
+			YY_BUFFER_STATE b = YY_CURRENT_BUFFER_LVALUE;
 
 			int yy_c_buf_p_offset =
 				(int) ((yy_c_buf_p) - b->yy_ch_buf);
 
 			if ( b->yy_is_our_buffer )
 				{
-				int new_size = b->yy_buf_size * 2;
+				yy_size_t new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -1586,7 +1598,7 @@ static int yy_get_next_buffer (void)
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), (size_t) num_to_read );
+			(yy_n_chars), num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
@@ -1682,7 +1694,7 @@ static int yy_get_next_buffer (void)
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + (unsigned int) yy_c];
 	yy_is_jam = (yy_current_state == 72);
 
-	return yy_is_jam ? 0 : yy_current_state;
+		return yy_is_jam ? 0 : yy_current_state;
 }
 
     static void yyunput (int c, register char * yy_bp )
@@ -1697,7 +1709,7 @@ static int yy_get_next_buffer (void)
 	if ( yy_cp < YY_CURRENT_BUFFER_LVALUE->yy_ch_buf + 2 )
 		{ /* need to shift things up to make room */
 		/* +2 for EOB chars. */
-		register int number_to_move = (yy_n_chars) + 2;
+		register yy_size_t number_to_move = (yy_n_chars) + 2;
 		register char *dest = &YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[
 					YY_CURRENT_BUFFER_LVALUE->yy_buf_size + 2];
 		register char *source =
@@ -1746,7 +1758,7 @@ static int yy_get_next_buffer (void)
 
 		else
 			{ /* need more input */
-			int offset = (yy_c_buf_p) - (yytext_ptr);
+			yy_size_t offset = (yy_c_buf_p) - (yytext_ptr);
 			++(yy_c_buf_p);
 
 			switch ( yy_get_next_buffer(  ) )
@@ -2020,7 +2032,7 @@ void slice_pop_buffer_state (void)
  */
 static void slice_ensure_buffer_stack (void)
 {
-	int num_to_alloc;
+	yy_size_t num_to_alloc;
     
 	if (!(yy_buffer_stack)) {
 
@@ -2112,17 +2124,17 @@ YY_BUFFER_STATE slice__scan_string (yyconst char * yystr )
 
 /** Setup the input buffer state to scan the given bytes. The next call to slice_lex() will
  * scan from a @e copy of @a bytes.
- * @param bytes the byte buffer to scan
- * @param len the number of bytes in the buffer pointed to by @a bytes.
+ * @param yybytes the byte buffer to scan
+ * @param _yybytes_len the number of bytes in the buffer pointed to by @a bytes.
  * 
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE slice__scan_bytes  (yyconst char * yybytes, int  _yybytes_len )
+YY_BUFFER_STATE slice__scan_bytes  (yyconst char * yybytes, yy_size_t  _yybytes_len )
 {
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
-	int i;
+	yy_size_t i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = _yybytes_len + 2;
@@ -2204,7 +2216,7 @@ FILE *slice_get_out  (void)
 /** Get the length of the current token.
  * 
  */
-int slice_get_leng  (void)
+yy_size_t slice_get_leng  (void)
 {
         return slice_leng;
 }
@@ -2352,7 +2364,7 @@ void slice_free (void * ptr )
 
 #define YYTABLES_NAME "yytables"
 
-#line 478 "Scanner.l"
+#line 470 "Scanner.l"
 
 
 
@@ -2394,6 +2406,7 @@ initScanner()
     keywordMap["true"] = ICE_TRUE;
     keywordMap["idempotent"] = ICE_IDEMPOTENT;
     keywordMap["optional"] = ICE_OPTIONAL;
+    keywordMap["Value"] = ICE_VALUE;
 }
 
 //
@@ -2409,15 +2422,15 @@ checkKeyword(string& id)
     StringTokenMap::const_iterator pos = keywordMap.find(id);
     if(pos != keywordMap.end())
     {
-    	if(pos->first != id)
-	{
-	    string msg;
-	    msg = "illegal identifier: `" + id + "' differs from keyword `";
-	    msg += pos->first + "' only in capitalization";
-	    unit->error(msg);
-	    id = pos->first;
-	}
-	return pos->second;
+        if(pos->first != id)
+        {
+            string msg;
+            msg = "illegal identifier: `" + id + "' differs from keyword `";
+            msg += pos->first + "' only in capitalization";
+            unit->error(msg);
+            id = pos->first;
+        }
+        return pos->second;
     }
     return ICE_IDENTIFIER;
 }
diff --git a/cpp/src/Slice/Scanner.l b/cpp/src/Slice/Scanner.l
index 9821508df30..0e7eef5a7fe 100644
--- a/cpp/src/Slice/Scanner.l
+++ b/cpp/src/Slice/Scanner.l
@@ -9,7 +9,7 @@
 //
 // **********************************************************************
 
-#include <Slice/GrammarUtil.h>	// Before Grammer.h, so that YYSTYPE is defined
+#include <Slice/GrammarUtil.h>  // Before Grammer.h, so that YYSTYPE is defined
 #include <Slice/Grammar.h>
 #include <IceUtil/InputUtil.h>
 
@@ -50,7 +50,7 @@
 #      define slice_wrap() 1
 #   endif
 #   ifdef ICE_64
-#       pragma error_messages(off,truncwarn)      
+#       pragma error_messages(off,truncwarn)
 #   endif
 #endif
 
@@ -63,7 +63,7 @@ namespace Slice
 //
 // Definitions for the case-insensitive keyword-token map.
 //
-typedef std::map<std::string, int, Slice::CICompare> StringTokenMap;
+typedef std::map<std::string, int> StringTokenMap;
 static StringTokenMap keywordMap;
 
 void initScanner();
@@ -71,7 +71,7 @@ int checkKeyword(string&);
 
 }
 
-#define	YY_USER_INIT initScanner();
+#define YY_USER_INIT initScanner();
 
 %}
 
@@ -80,11 +80,11 @@ int checkKeyword(string&);
 %option prefix="slice_"
 %option outfile="lex.yy.c"
 
-identifier		\\?[[:alpha:]_][[:alnum:]_]*
-integer_constant	(\+|-)?((0[0-7]+)|(0x[[:xdigit:]]+)|([[:digit:]]+))
-fractional_constant	(\+|-)?(([[:digit:]]*\.[[:digit:]]+)|([[:digit:]]+\.))
-exponent_part		(e|E)(\+|-)?[[:digit:]]+
-floating_literal	(({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{exponent_part}))[fF]?
+identifier      \\?[[:alpha:]_][[:alnum:]_]*
+integer_constant    (\+|-)?((0[0-7]+)|(0x[[:xdigit:]]+)|([[:digit:]]+))
+fractional_constant (\+|-)?(([[:digit:]]*\.[[:digit:]]+)|([[:digit:]]+\.))
+exponent_part       (e|E)(\+|-)?[[:digit:]]+
+floating_literal    (({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{exponent_part}))[fF]?
 
 %s BOMSCAN
 %s MAINSCAN
@@ -125,11 +125,11 @@ floating_literal	(({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e
     int c;
     do
     {
-	c = yyinput();
-	if(c == '\n')
-	{
-	    unit->nextLine();
-	}
+        c = yyinput();
+        if(c == '\n')
+        {
+            unit->nextLine();
+        }
     }
     while(c != '\n' && c != EOF);
 }
@@ -140,38 +140,38 @@ floating_literal	(({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e
     string comment = yytext + 2;
     while(true)
     {
-	int c = yyinput();
-	if(c == '\n')
-	{
-	    comment += static_cast<char>(c);
-	    unit->nextLine();
-	}
-	else if(c == '*')
-	{
-	    int next = yyinput();
-	    if(next == '/')
-	    {
-		break;
-	    }
-	    else
-	    {
-		comment += static_cast<char>(c);
-		unput(next);
-	    }
-	}
-	else if(c == EOF)
-	{
-	    unit->warning("EOF in comment");
-	    break;
-	}
-	else
-	{
-	    comment += static_cast<char>(c);
-	}
+        int c = yyinput();
+        if(c == '\n')
+        {
+            comment += static_cast<char>(c);
+            unit->nextLine();
+        }
+        else if(c == '*')
+        {
+            int next = yyinput();
+            if(next == '/')
+            {
+                break;
+            }
+            else
+            {
+                comment += static_cast<char>(c);
+                unput(next);
+            }
+        }
+        else if(c == EOF)
+        {
+            unit->warning("EOF in comment");
+            break;
+        }
+        else
+        {
+            comment += static_cast<char>(c);
+        }
     }
     if(!comment.empty() && comment[0] == '*')
     {
-	unit->setComment(comment);
+        unit->setComment(comment);
     }
 }
 
@@ -239,156 +239,149 @@ floating_literal	(({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e
     str->literal = "\"";
     while(true)
     {
-	char c = static_cast<char>(yyinput());
+        char c = static_cast<char>(yyinput());
         str->literal += c;
-	if(c == '"')
-	{
-	    break;
-	}
-	else if(c == EOF)
-	{
-	    unit->error("EOF in string");
-	    break;
-	}
-	else if(c == '\n')
-	{
-	    unit->error("newline in string");
-	}
-	else if(c == '\\')
-	{
-	    char next = static_cast<char>(yyinput());
+        if(c == '"')
+        {
+            break;
+        }
+        else if(c == EOF)
+        {
+            unit->error("EOF in string");
+            break;
+        }
+        else if(c == '\n')
+        {
+            unit->error("newline in string");
+        }
+        else if(c == '\\')
+        {
+            char next = static_cast<char>(yyinput());
             str->literal += next;
-	    switch(next)
-	    {
-		case '\\':
-		case '"':
-		case '\'':
-		{
-		    str->v += next;
-		    break;
-		}
-	    
-		case 'n':
-		{
-		    str->v += '\n';
-		    break;
-		}
-	    
-		case 'r':
-		{
-		    str->v += '\r';
-		    break;
-		}
-
-		case 't':
-		{
-		    str->v += '\t';
-		    break;
-		}
-	    
-		case 'v':
-		{
-		    str->v += '\v';
-		    break;
-		}
-	    
-		case 'f':
-		{
-		    str->v += '\f';
-		    break;
-		}
-
-		case 'a':
-		{
-		    str->v += '\a';
-		    break;
-		}
-
-		case 'b':
-		{
-		    str->v += '\b';
-		    break;
-		}
-
-		case '?':
-		{
-		    str->v += '\?';
-		    break;
-		}
-
-		case '0':
-		case '1':
-		case '2':
-		case '3':
-		{
-		    static string octalDigits = "01234567";
-		    unsigned short us = next - '0';
-		    if(octalDigits.find_first_of(next = static_cast<char>(yyinput())) != string::npos)
-		    {
+            switch(next)
+            {
+                case '\\':
+                case '"':
+                case '\'':
+                {
+                    str->v += next;
+                    break;
+                }
+                case 'n':
+                {
+                    str->v += '\n';
+                    break;
+                }
+                case 'r':
+                {
+                    str->v += '\r';
+                    break;
+                }
+                case 't':
+                {
+                    str->v += '\t';
+                    break;
+                }
+                case 'v':
+                {
+                    str->v += '\v';
+                    break;
+                }
+                case 'f':
+                {
+                    str->v += '\f';
+                    break;
+                }
+
+                case 'a':
+                {
+                    str->v += '\a';
+                    break;
+                }
+
+                case 'b':
+                {
+                    str->v += '\b';
+                    break;
+                }
+
+                case '?':
+                {
+                    str->v += '\?';
+                    break;
+                }
+
+                case '0':
+                case '1':
+                case '2':
+                case '3':
+                {
+                    static string octalDigits = "01234567";
+                    unsigned short us = next - '0';
+                    if(octalDigits.find_first_of(next = static_cast<char>(yyinput())) != string::npos)
+                    {
                         str->literal += next;
-		    	us = us * 8 + next - '0';
-			if(octalDigits.find_first_of(next = static_cast<char>(yyinput())) != string::npos)
-			{
-			    us = us * 8 + next - '0';
-			}
-			else
-			{
-			    unput(next);
-			}
-		    }
-		    else
-		    {
-		    	unput(next);
-		    }
-		    if(us == 0)
-		    {
-			unit->error("illegal NUL character in string constant");
-		    }
-		    str->v += static_cast<char>(us);
-		    break;
-		}
-		case 'x':
-		{
-		    IceUtil::Int64 ull = 0;
-		    while(isxdigit(static_cast<unsigned char>(next = static_cast<char>(yyinput()))))
-		    {
+                        us = us * 8 + next - '0';
+                        if(octalDigits.find_first_of(next = static_cast<char>(yyinput())) != string::npos)
+                        {
+                            us = us * 8 + next - '0';
+                        }
+                        else
+                        {
+                            unput(next);
+                        }
+                    }
+                    else
+                    {
+                        unput(next);
+                    }
+                    if(us == 0)
+                    {
+                        unit->error("illegal NUL character in string constant");
+                    }
+                    str->v += static_cast<char>(us);
+                    break;
+                }
+                case 'x':
+                {
+                    IceUtil::Int64 ull = 0;
+                    while(isxdigit(static_cast<unsigned char>(next = static_cast<char>(yyinput()))))
+                    {
                         str->literal += next;
-			ull *= 16;
-			if(isdigit(static_cast<unsigned char>(next)))
-			{
-			    ull += next - '0';
-			}
-			else if(islower(static_cast<unsigned char>(next)))
-			{
-			    ull += next - 'a' + 10;
-			}
-			else
-			{
-			    ull += next - 'A' + 10;
-			}
-		    }
-		    unput(next);
-		    if(ull == 0)
-		    {
-			unit->error("illegal NUL character in string constant");
-		    }
-		    str->v += static_cast<char>(ull);
-		    break;
-		}
-	
-		// TODO: add universal character names
-	    
-		default:
-		{
-		    str->v += c;
-		    unput(next);
-		}
-	    }
-	}
-	else
-	{
-	    str->v += c;
-	}
+                        ull *= 16;
+                        if(isdigit(static_cast<unsigned char>(next)))
+                        {
+                            ull += next - '0';
+                        }
+                        else if(islower(static_cast<unsigned char>(next)))
+                        {
+                            ull += next - 'a' + 10;
+                        }
+                        else
+                        {
+                            ull += next - 'A' + 10;
+                        }
+                    }
+                    unput(next);
+                    if(ull == 0)
+                    {
+                        unit->error("illegal NUL character in string constant");
+                    }
+                    str->v += static_cast<char>(ull);
+                    break;
+                }
+                // TODO: add universal character names
+                default:
+                {
+                    str->v += c;
+                    unput(next);
+                }
+            }
+        }
+        else
+        {
+            str->v += c;
+        }
     }
     *yylvalp = str;
     return ICE_STRING_LITERAL;
@@ -401,11 +394,11 @@ floating_literal	(({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e
     *yylvalp = itp;
     if(!IceUtilInternal::stringToInt64(string(yytext), itp->v))
     {
-	assert(itp->v != 0);
-	string msg = "integer constant `";
-	msg += yytext;
-	msg += "' out of range";
-	unit->error(msg);
+        assert(itp->v != 0);
+        string msg = "integer constant `";
+        msg += yytext;
+        msg += "' out of range";
+        unit->error(msg);
     }
     return ICE_INTEGER_LITERAL;
 }
@@ -420,42 +413,42 @@ floating_literal	(({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e
     char lastChar = literal[literal.size() - 1];
     if(lastChar == 'f' || lastChar == 'F')
     {
-    	literal = literal.substr(0, literal.size() - 1);	// Clobber trailing 'f' or 'F' suffix
+        literal = literal.substr(0, literal.size() - 1);    // Clobber trailing 'f' or 'F' suffix
     }
     ftp->v = strtod(literal.c_str(), 0);
     if((ftp->v == HUGE_VAL || ftp->v == -HUGE_VAL) && errno == ERANGE)
     {
-	string msg = "floating-point constant `";
-	msg += yytext;
-	msg += "' too large (overflow)";
-	unit->error(msg);
+        string msg = "floating-point constant `";
+        msg += yytext;
+        msg += "' too large (overflow)";
+        unit->error(msg);
     }
     else if(ftp->v == 0 && errno == ERANGE)
     {
-	string msg = "floating-point constant `";
-	msg += yytext;
-	msg += "' too small (underflow)";
-	unit->error(msg);
+        string msg = "floating-point constant `";
+        msg += yytext;
+        msg += "' too small (underflow)";
+    unit->error(msg);
     }
     return ICE_FLOATING_POINT_LITERAL;
 }
 
 [[:space:]] {
     // Ignore white-space
-    
+
     if(unit->currentLine() != 0)
     {
         BEGIN(MAINSCAN);
     }
     if(yytext[0] == '\n')
     {
-	unit->nextLine();
+        unit->nextLine();
     }
 }
 
 <BOMSCAN>^"\357\273\277" {
     // Ignore UTF-8 BOM, rule only active when parsing start of file.
-    
+
     BEGIN(MAINSCAN);
 }
 
@@ -463,14 +456,14 @@ floating_literal	(({fractional_constant}{exponent_part}?)|((\+|-)?[[:digit:]]+{e
     BEGIN(MAINSCAN);
     if(yytext[0] < 32 || yytext[0] > 126)
     {
-	stringstream s;
-	s << "illegal input character: '\\";
-	s.width(3);
-	s.fill('0');
-	s << oct << static_cast<int>(static_cast<unsigned char>(yytext[0]));
-	s << "'";
-	unit->error(s.str());
-	return BAD_CHAR;
+        stringstream s;
+        s << "illegal input character: '\\";
+        s.width(3);
+        s.fill('0');
+        s << oct << static_cast<int>(static_cast<unsigned char>(yytext[0]));
+        s << "'";
+        unit->error(s.str());
+        return BAD_CHAR;
     }
     return yytext[0];
 }
@@ -515,6 +508,7 @@ initScanner()
     keywordMap["true"] = ICE_TRUE;
     keywordMap["idempotent"] = ICE_IDEMPOTENT;
     keywordMap["optional"] = ICE_OPTIONAL;
+    keywordMap["Value"] = ICE_VALUE;
 }
 
 //
@@ -530,15 +524,15 @@ checkKeyword(string& id)
     StringTokenMap::const_iterator pos = keywordMap.find(id);
     if(pos != keywordMap.end())
     {
-    	if(pos->first != id)
-	{
-	    string msg;
-	    msg = "illegal identifier: `" + id + "' differs from keyword `";
-	    msg += pos->first + "' only in capitalization";
-	    unit->error(msg);
-	    id = pos->first;
-	}
-	return pos->second;
+        if(pos->first != id)
+        {
+            string msg;
+            msg = "illegal identifier: `" + id + "' differs from keyword `";
+            msg += pos->first + "' only in capitalization";
+            unit->error(msg);
+            id = pos->first;
+        }
+        return pos->second;
     }
     return ICE_IDENTIFIER;
 }
diff --git a/cpp/src/iceserviceinstall/.depend.mak b/cpp/src/iceserviceinstall/.depend.mak
index d33f2323c71..534c957158c 100755
--- a/cpp/src/iceserviceinstall/.depend.mak
+++ b/cpp/src/iceserviceinstall/.depend.mak
@@ -16,6 +16,7 @@ ServiceInstaller.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ ServiceInstaller.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -64,7 +66,7 @@ ServiceInstaller.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -78,6 +80,7 @@ ServiceInstaller.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -89,7 +92,6 @@ ServiceInstaller.obj: \
     "$(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" \
@@ -112,7 +114,6 @@ ServiceInstaller.obj: \
     "$(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" \
@@ -144,6 +145,7 @@ Install.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -152,6 +154,7 @@ Install.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -192,7 +195,7 @@ Install.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -206,6 +209,7 @@ Install.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -217,7 +221,6 @@ Install.obj: \
     "$(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" \
@@ -240,7 +243,6 @@ Install.obj: \
     "$(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" \
diff --git a/cpp/src/slice2cpp/Gen.cpp b/cpp/src/slice2cpp/Gen.cpp
index e9e771bf64f..c0ae7f2fa25 100644
--- a/cpp/src/slice2cpp/Gen.cpp
+++ b/cpp/src/slice2cpp/Gen.cpp
@@ -29,6 +29,56 @@ using namespace IceUtilInternal;
 namespace
 {
 
+bool
+isConstexprType(const TypePtr& type)
+{
+    BuiltinPtr bp = BuiltinPtr::dynamicCast(type);
+    if(bp)
+    {
+        switch(bp->kind())
+        {
+            case Builtin::KindByte:
+            case Builtin::KindBool:
+            case Builtin::KindShort:
+            case Builtin::KindInt:
+            case Builtin::KindLong:
+            case Builtin::KindFloat:
+            case Builtin::KindDouble:
+            case Builtin::KindValue:
+            case Builtin::KindObject:
+            case Builtin::KindObjectProxy:
+            {
+                return true;
+            }
+            default:
+            {
+                return false;
+            }
+        }
+    }
+    else if(EnumPtr::dynamicCast(type) || ProxyPtr::dynamicCast(type) || ClassDeclPtr::dynamicCast(type))
+    {
+        return true;
+    }
+    else
+    {
+        StructPtr s = StructPtr::dynamicCast(type);
+        if(s)
+        {
+            DataMemberList members = s->dataMembers();
+            for(DataMemberList::const_iterator i = members.begin(); i != members.end(); ++i)
+            {
+                if(!isConstexprType((*i)->type()))
+                {
+                    return false;
+                }
+            }
+            return true;
+        }
+        return false;
+    }
+}
+
 string
 getDeprecateSymbol(const ContainedPtr& p1, const ContainedPtr& p2)
 {
@@ -48,7 +98,7 @@ getDeprecateSymbol(const ContainedPtr& p1, const ContainedPtr& p2)
 
 void
 writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const SyntaxTreeBasePtr& valueType,
-                   const string& value, int useWstring, const StringList& metaData)
+                   const string& value, int useWstring, const StringList& metaData, bool cpp11 = false)
 {
     ConstPtr constant = ConstPtr::dynamicCast(valueType);
     if(constant)
@@ -108,7 +158,14 @@ writeConstantValue(IceUtilInternal::Output& out, const TypePtr& type, const Synt
         }
         else if(bp && bp->kind() == Builtin::KindLong)
         {
-            out << "ICE_INT64(" << value << ")";
+            if(cpp11)
+            {
+                out << value << "LL";
+            }
+            else
+            {
+                out << "ICE_INT64(" << value << ")";
+            }
         }
         else if(bp && bp->kind() == Builtin::KindFloat)
         {
@@ -364,10 +421,10 @@ Slice::Gen::generate(const UnitPtr& p)
     C << _base << "." << _headerExtension << ">";
     C <<  "\n#include <IceUtil/PushDisableWarnings.h>";
 
-
     H << "\n#include <IceUtil/PushDisableWarnings.h>";
     H << "\n#include <Ice/ProxyF.h>";
     H << "\n#include <Ice/ObjectF.h>";
+    H << "\n#include <Ice/ValueF.h>";
     H << "\n#include <Ice/Exception.h>";
     H << "\n#include <Ice/LocalObject.h>";
     H << "\n#include <Ice/StreamHelpers.h>";
@@ -375,7 +432,9 @@ Slice::Gen::generate(const UnitPtr& p)
     if(p->hasNonLocalClassDefs())
     {
         H << "\n#include <Ice/Proxy.h>";
+        H << "\n#include <Ice/Object.h>";
         H << "\n#include <Ice/GCObject.h>";
+        H << "\n#include <Ice/Value.h>";
         H << "\n#include <Ice/AsyncResult.h>";
         H << "\n#include <Ice/Incoming.h>";
         if(p->hasContentsWithMetaData("amd"))
@@ -398,7 +457,7 @@ Slice::Gen::generate(const UnitPtr& p)
         H << "\n#include <Ice/Proxy.h>";
     }
 
-    if(p->hasNonLocalDataOnlyClasses() || p->hasNonLocalExceptions())
+    if(p->hasNonLocalClassDefs() || p->hasNonLocalExceptions())
     {
         H << "\n#include <Ice/FactoryTableInit.h>";
     }
@@ -482,95 +541,203 @@ Slice::Gen::generate(const UnitPtr& p)
         _dllExport += " ";
     }
 
-    ProxyDeclVisitor proxyDeclVisitor(H, C, _dllExport);
-    p->visit(&proxyDeclVisitor, false);
+    H << sp;
+    H.zeroIndent();
+    H << nl << "#ifndef ICE_CPP11_MAPPING // C++98 mapping";
+    H.restoreIndent();
+
+    C << sp;
+    C.zeroIndent();
+    C << nl << "#ifndef ICE_CPP11_MAPPING // C++98 mapping";
+    C.restoreIndent();
+    {
+        ProxyDeclVisitor proxyDeclVisitor(H, C, _dllExport);
+        p->visit(&proxyDeclVisitor, false);
 
-    ObjectDeclVisitor objectDeclVisitor(H, C, _dllExport);
-    p->visit(&objectDeclVisitor, false);
+        ObjectDeclVisitor objectDeclVisitor(H, C, _dllExport);
+        p->visit(&objectDeclVisitor, false);
 
-    TypesVisitor typesVisitor(H, C, _dllExport, _stream);
-    p->visit(&typesVisitor, false);
+        TypesVisitor typesVisitor(H, C, _dllExport, _stream);
+        p->visit(&typesVisitor, false);
 
-    StreamVisitor streamVisitor(H, C, _dllExport);
-    p->visit(&streamVisitor, false);
+        StreamVisitor streamVisitor(H, C, _dllExport);
+        p->visit(&streamVisitor, false);
 
-    AsyncVisitor asyncVisitor(H, C, _dllExport);
-    p->visit(&asyncVisitor, false);
+        AsyncVisitor asyncVisitor(H, C, _dllExport);
+        p->visit(&asyncVisitor, false);
 
-    AsyncImplVisitor asyncImplVisitor(H, C, _dllExport);
-    p->visit(&asyncImplVisitor, false);
+        AsyncImplVisitor asyncImplVisitor(H, C, _dllExport);
+        p->visit(&asyncImplVisitor, false);
 
-    //
-    // The templates are emitted before the proxy definition
-    // so the derivation hierarchy is known to the proxy:
-    // the proxy relies on knowing the hierarchy to make the begin_
-    // methods type-safe.
-    //
-    AsyncCallbackVisitor asyncCallbackVisitor(H, C, _dllExport);
-    p->visit(&asyncCallbackVisitor, false);
+        //
+        // The templates are emitted before the proxy definition
+        // so the derivation hierarchy is known to the proxy:
+        // the proxy relies on knowing the hierarchy to make the begin_
+        // methods type-safe.
+        //
+        AsyncCallbackVisitor asyncCallbackVisitor(H, C, _dllExport);
+        p->visit(&asyncCallbackVisitor, false);
 
-    ProxyVisitor proxyVisitor(H, C, _dllExport);
-    p->visit(&proxyVisitor, false);
+        ProxyVisitor proxyVisitor(H, C, _dllExport);
+        p->visit(&proxyVisitor, false);
 
-    ObjectVisitor objectVisitor(H, C, _dllExport, _stream);
-    p->visit(&objectVisitor, false);
+        ObjectVisitor objectVisitor(H, C, _dllExport, _stream);
+        p->visit(&objectVisitor, false);
 
-    //
-    // We need to delay generating the template after the proxy
-    // definition, because completed calls the begin_ method in the
-    // proxy.
-    //
-    AsyncCallbackTemplateVisitor asyncCallbackTemplateVisitor(H, C, _dllExport);
-    p->visit(&asyncCallbackTemplateVisitor, false);
+        //
+        // We need to delay generating the template after the proxy
+        // definition, because completed calls the begin_ method in the
+        // proxy.
+        //
+        AsyncCallbackTemplateVisitor asyncCallbackTemplateVisitor(H, C, _dllExport);
+        p->visit(&asyncCallbackTemplateVisitor, false);
 
-    if(_impl)
-    {
-        implH << "\n#include <";
-        if(_include.size())
+        if(_impl)
         {
-            implH << _include << '/';
-        }
-        implH << _base << "." << _headerExtension << ">";
+            implH << "\n#include <";
+            if(_include.size())
+            {
+                implH << _include << '/';
+            }
+            implH << _base << "." << _headerExtension << ">";
 
-        writeExtraHeaders(implC);
+            writeExtraHeaders(implC);
 
-        implC << "\n#include <";
-        if(_include.size())
-        {
-            implC << _include << '/';
+            implC << "\n#include <";
+            if(_include.size())
+            {
+                implC << _include << '/';
+            }
+            implC << _base << "I." << _implHeaderExtension << ">";
+
+            ImplVisitor implVisitor(implH, implC, _dllExport);
+            p->visit(&implVisitor, false);
         }
-        implC << _base << "I." << _implHeaderExtension << ">";
 
-        ImplVisitor implVisitor(implH, implC, _dllExport);
-        p->visit(&implVisitor, false);
+        if(_checksum)
+        {
+            ChecksumMap map = createChecksums(p);
+            if(!map.empty())
+            {
+                C << sp << nl << "namespace";
+                C << nl << "{";
+                C << sp << nl << "const char* __sliceChecksums[] =";
+                C << sb;
+                for(ChecksumMap::const_iterator q = map.begin(); q != map.end(); ++q)
+                {
+                    C << nl << "\"" << q->first << "\", \"";
+                    ostringstream str;
+                    str.flags(ios_base::hex);
+                    str.fill('0');
+                    for(vector<unsigned char>::const_iterator r = q->second.begin(); r != q->second.end(); ++r)
+                    {
+                        str << static_cast<int>(*r);
+                    }
+                    C << str.str() << "\",";
+                }
+                C << nl << "0";
+                C << eb << ';';
+                C << nl << "const IceInternal::SliceChecksumInit __sliceChecksumInit(__sliceChecksums);";
+                C << sp << nl << "}";
+            }
+        }
     }
+    H << sp;
+    H.zeroIndent();
+    H << nl << "#else // C++11 mapping";
+    H.restoreIndent();
 
-    if(_checksum)
+    C << sp;
+    C.zeroIndent();
+    C << nl << "#else // C++11 mapping";
+    C.restoreIndent();
     {
-        ChecksumMap map = createChecksums(p);
-        if(!map.empty())
+        Cpp11ProxyDeclVisitor proxyDeclVisitor(H, C, _dllExport);
+        p->visit(&proxyDeclVisitor, false);
+
+        Cpp11ObjectDeclVisitor objectDeclVisitor(H, C, _dllExport);
+        p->visit(&objectDeclVisitor, false);
+
+        Cpp11TypesVisitor typesVisitor(H, C, _dllExport, _stream);
+        p->visit(&typesVisitor, false);
+
+        Cpp11StreamVisitor streamVisitor(H, C, _dllExport);
+        p->visit(&streamVisitor, false);
+
+        Cpp11ProxyVisitor proxyVisitor(H, C, _dllExport);
+        p->visit(&proxyVisitor, false);
+        
+        Cpp11InterfaceTraitsVisitor interfaceTraitsVisitor(H, C, _dllExport);
+        p->visit(&interfaceTraitsVisitor, false);
+
+        Cpp11LocalObjectVisitor localObjectVisitor(H, C, _dllExport, _stream);
+        p->visit(&localObjectVisitor, false);
+        
+        Cpp11InterfaceVisitor interfaceVisitor(H, C, _dllExport, _stream);
+        p->visit(&interfaceVisitor, false);
+        
+        Cpp11ValueVisitor valueVisitor(H, C, _dllExport, _stream);
+        p->visit(&valueVisitor, false);
+
+        // TODO
+        /*if(_impl)
         {
-            C << sp << nl << "namespace";
-            C << nl << "{";
-            C << sp << nl << "const char* __sliceChecksums[] =";
-            C << sb;
-            for(ChecksumMap::const_iterator q = map.begin(); q != map.end(); ++q)
+            implH << "\n#include <";
+            if(_include.size())
+            {
+                implH << _include << '/';
+            }
+            implH << _base << "." << _headerExtension << ">";
+
+            writeExtraHeaders(implC);
+
+            implC << "\n#include <";
+            if(_include.size())
+            {
+                implC << _include << '/';
+            }
+            implC << _base << "I." << _implHeaderExtension << ">";
+
+            ImplVisitor implVisitor(implH, implC, _dllExport);
+            p->visit(&implVisitor, false);
+        }
+
+        if(_checksum)
+        {
+            ChecksumMap map = createChecksums(p);
+            if(!map.empty())
             {
-                C << nl << "\"" << q->first << "\", \"";
-                ostringstream str;
-                str.flags(ios_base::hex);
-                str.fill('0');
-                for(vector<unsigned char>::const_iterator r = q->second.begin(); r != q->second.end(); ++r)
+                C << sp << nl << "namespace";
+                C << nl << "{";
+                C << sp << nl << "const char* __sliceChecksums[] =";
+                C << sb;
+                for(ChecksumMap::const_iterator q = map.begin(); q != map.end(); ++q)
                 {
-                    str << static_cast<int>(*r);
+                    C << nl << "\"" << q->first << "\", \"";
+                    ostringstream str;
+                    str.flags(ios_base::hex);
+                    str.fill('0');
+                    for(vector<unsigned char>::const_iterator r = q->second.begin(); r != q->second.end(); ++r)
+                    {
+                        str << static_cast<int>(*r);
+                    }
+                    C << str.str() << "\",";
                 }
-                C << str.str() << "\",";
+                C << nl << "0";
+                C << eb << ';';
+                C << nl << "const IceInternal::SliceChecksumInit __sliceChecksumInit(__sliceChecksums);";
+                C << sp << nl << "}";
             }
-            C << nl << "0";
-            C << eb << ';';
-            C << nl << "const IceInternal::SliceChecksumInit __sliceChecksumInit(__sliceChecksums);";
-            C << sp << nl << "}";
-        }
+        }*/
+        H << sp;
+        H.zeroIndent();
+        H << nl << "#endif";
+        H.restoreIndent();
+
+        C << sp;
+        C.zeroIndent();
+        C << nl << "#endif";
+        C.restoreIndent();
     }
 }
 
@@ -1789,16 +1956,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
     string thisPointer = fixKwd(scope.substr(0, scope.size() - 2)) + "*";
 
     string deprecateSymbol = getDeprecateSymbol(p, cl);
-    H << sp << nl << deprecateSymbol << retS << ' ' << fixKwd(name) << spar << paramsDecl << epar;
-    H << sb;
-    H << nl;
-    if(ret)
-    {
-        H << "return ";
-    }
-    H << fixKwd(name) << spar << args << "0" << epar << ';';
-    H << eb;
-    H << nl << deprecateSymbol << retS << ' ' << fixKwd(name) << spar << paramsDecl << "const ::Ice::Context& __ctx"
+    H << nl << deprecateSymbol << retS << ' ' << fixKwd(name) << spar << paramsDecl << "const ::Ice::Context& __ctx = ::Ice::noExplicitContext"
       << epar;
     H << sb;
     H << nl;
@@ -1810,7 +1968,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
     H << eb;
 
     H.zeroIndent();
-    H << nl << "#ifdef ICE_CPP11";
+    H << nl << "#ifdef ICE_CPP11_COMPILER";
     H.restoreIndent();
 
     string retEndArg = getEndArg(ret, p->getMetaData(), "__ret");
@@ -1845,12 +2003,12 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
     H << sb;
     if(p->returnsData())
     {
-        H << nl << "return __begin_" << name << spar << argsAMI << "0, __response, __exception, __sent" << epar << ";";
+        H << nl << "return __begin_" << name << spar << argsAMI << "&::Ice::noExplicitContext, __response, __exception, __sent" << epar << ";";
     }
     else
     {
         H << nl << "return begin_" << name << spar << argsAMI
-          << "0, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent)" << epar << ";";
+          << "&::Ice::noExplicitContext, new ::IceInternal::Cpp11FnOnewayCallbackNC(__response, __exception, __sent)" << epar << ";";
 
     }
     H << eb;
@@ -1872,7 +2030,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
       << "const ::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>& __sent = "
          "::IceInternal::Function<void (const ::Ice::AsyncResultPtr&)>()" << epar;
     H << sb;
-    H << nl << "return begin_" << name << spar << argsAMI << "0, ::Ice::newCallback(__completed, __sent), 0" << epar << ";";
+    H << nl << "return begin_" << name << spar << argsAMI << "&::Ice::noExplicitContext, ::Ice::newCallback(__completed, __sent), 0" << epar << ";";
     H << eb;
 
     //
@@ -1994,7 +2152,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
 
     H << sp << nl << "::Ice::AsyncResultPtr begin_" << name << spar << paramsDeclAMI << epar;
     H << sb;
-    H << nl << "return begin_" << name << spar << argsAMI << "0" << "::IceInternal::__dummyCallback" << "0"
+    H << nl << "return begin_" << name << spar << argsAMI << "&::Ice::noExplicitContext" << "::IceInternal::__dummyCallback" << "0"
       << epar << ';';
     H << eb;
 
@@ -2009,7 +2167,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
       << "const ::Ice::CallbackPtr& __del"
       << "const ::Ice::LocalObjectPtr& __cookie = 0" << epar;
     H << sb;
-    H << nl << "return begin_" << name << spar << argsAMI << "0" << "__del" << "__cookie" << epar << ';';
+    H << nl << "return begin_" << name << spar << argsAMI << "&::Ice::noExplicitContext" << "__del" << "__cookie" << epar << ';';
     H << eb;
 
     H << sp << nl << "::Ice::AsyncResultPtr begin_" << name << spar << paramsDeclAMI
@@ -2024,7 +2182,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
       << "const " + delNameScoped + "Ptr& __del"
       << "const ::Ice::LocalObjectPtr& __cookie = 0" << epar;
     H << sb;
-    H << nl << "return begin_" << name << spar << argsAMI << "0" << "__del" << "__cookie" << epar << ';';
+    H << nl << "return begin_" << name << spar << argsAMI << "&::Ice::noExplicitContext" << "__del" << "__cookie" << epar << ';';
     H << eb;
 
     H << sp << nl << "::Ice::AsyncResultPtr begin_" << name << spar << paramsDeclAMI
@@ -2206,7 +2364,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
 
     if(p->returnsData())
     {
-        C << nl << nl << "#ifdef ICE_CPP11";
+        C << nl << nl << "#ifdef ICE_CPP11_COMPILER";
 
         //
         // COMPILERFIX VC compilers up to VC110 don't support more than 10 parameters with std::function due to
@@ -2335,7 +2493,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
         {
             C << nl << "#endif";
         }
-        C << nl << "#endif"; // ICE_CPP11
+        C << nl << "#endif"; // ICE_CPP11_COMPILER
     }
 
     C << sp << nl << retS << nl << "IceProxy" << scope << "end_" << name << spar << outParamsDeclAMI
@@ -2445,6 +2603,7 @@ Slice::Gen::ProxyVisitor::visitOperation(const OperationPtr& p)
         C << nl << "throw ::Ice::UnknownUserException(__FILE__, __LINE__, __ex.ice_name());";
         C << eb;
         C << eb;
+        
         if(ret || !outParams.empty())
         {
             C << nl << "::IceInternal::BasicStream* __is = __result->__startReadParams();";
@@ -2504,6 +2663,7 @@ Slice::Gen::ObjectDeclVisitor::visitClassDecl(const ClassDeclPtr& p)
         H << nl << _dllExport << "::Ice::Object* upCast(" << scoped << "*);";
         H << nl << "typedef ::IceInternal::Handle< " << scoped << "> " << p->name() << "Ptr;";
         H << nl << "typedef ::IceInternal::ProxyHandle< ::IceProxy" << scoped << "> " << p->name() << "Prx;";
+        H << nl << "typedef " << p->name() << "Prx " << p->name() << "PrxPtr;";
         H << nl << _dllExport << "void __patch(" << p->name() << "Ptr&, const ::Ice::ObjectPtr&);";
     }
     else
@@ -2816,8 +2976,6 @@ Slice::Gen::ObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
             C << sb;
             if(!p->isAbstract())
             {
-                
-
                 C << nl << "::Ice::Object* __p = new " << name << "(*this);";
                 C << nl << "return __p;";
             }
@@ -4050,7 +4208,6 @@ void
 Slice::Gen::AsyncCallbackTemplateVisitor::visitModuleEnd(const ModulePtr&)
 {
     _useWstring = resetUseWstring(_useWstringHist);
-
     H << sp << nl << '}';
 }
 
@@ -4354,6 +4511,7 @@ Slice::Gen::ImplVisitor::writeDecl(Output& out, const string& name, const TypePt
                 break;
             }
             case Builtin::KindString:
+            case Builtin::KindValue:
             case Builtin::KindObject:
             case Builtin::KindObjectProxy:
             case Builtin::KindLocalObject:
@@ -4405,6 +4563,7 @@ Slice::Gen::ImplVisitor::writeReturn(Output& out, const TypePtr& type, const Str
                 out << nl << "return ::std::string();";
                 break;
             }
+            case Builtin::KindValue:
             case Builtin::KindObject:
             case Builtin::KindObjectProxy:
             case Builtin::KindLocalObject:
@@ -5448,14 +5607,20 @@ void
 Slice::Gen::MetaDataVisitor::validate(const SyntaxTreeBasePtr& cont, const StringList& metaData,
                                       const string& file, const string& line, bool /*inParam*/)
 {
-    static const string prefix = "cpp:";
+    static const string cppPrefix = "cpp:";
+    static const string cpp11Prefix = "cpp11:";
+    
     for(StringList::const_iterator p = metaData.begin(); p != metaData.end(); ++p)
     {
         string s = *p;
         if(_history.count(s) == 0)
         {
-            if(s.find(prefix) == 0)
+            bool cpp = s.find(cppPrefix) == 0;
+            bool cpp11 = s.find(cpp11Prefix) == 0;
+            if(cpp || cpp11)
             {
+                const string prefix = cpp ? cppPrefix : cpp11Prefix;
+                
                 string ss = s.substr(prefix.size());
                 if(ss == "type:wstring" || ss == "type:string")
                 {
@@ -5491,14 +5656,30 @@ Slice::Gen::MetaDataVisitor::validate(const SyntaxTreeBasePtr& cont, const Strin
                 {
                     continue;
                 }
-                if(ClassDefPtr::dynamicCast(cont) && ss == "virtual")
+                
                 {
-                    continue;
+                    ClassDefPtr cl = ClassDefPtr::dynamicCast(cont);
+                    if(cl && ((cpp && ss == "virtual") || (cpp11 && cl->isLocal() && ss.find("type:") == 0)))
+                    {
+                        continue;
+                    }
                 }
                 if(ExceptionPtr::dynamicCast(cont) && ss == "ice_print")
                 {
                     continue;
                 }
+                if(EnumPtr::dynamicCast(cont) && ss == "unscoped")
+                {
+                    continue;
+                }
+                
+                {
+                    ClassDeclPtr cl = ClassDeclPtr::dynamicCast(cont);
+                    if(cl && cpp11 && cl->isLocal() && ss.find("type:") == 0)
+                    {
+                        continue;
+                    }
+                }
                 emitWarning(file, line, "ignoring invalid metadata `" + s + "'");
             }
             _history.insert(s);
@@ -5544,3 +5725,3208 @@ Slice::Gen::getHeaderExt(const string& file, const UnitPtr& unit)
     }
     return ext;
 }
+
+// C++11 visitors
+Slice::Gen::Cpp11ObjectDeclVisitor::Cpp11ObjectDeclVisitor(Output& h, Output& c, const string& dllExport) :
+    H(h), C(c), _dllExport(dllExport)
+{
+}
+
+bool
+Slice::Gen::Cpp11ObjectDeclVisitor::visitModuleStart(const ModulePtr& p)
+{
+    if(!p->hasClassDecls())
+    {
+        return false;
+    }
+
+    string name = fixKwd(p->name());
+
+    H << sp << nl << "namespace " << name << nl << '{';
+    C << sp << nl << "namespace" << nl << "{";
+    return true;
+}
+
+void
+Slice::Gen::Cpp11ObjectDeclVisitor::visitModuleEnd(const ModulePtr&)
+{
+    H << sp << nl << '}';
+    C << sp << nl << "}";
+}
+
+void
+Slice::Gen::Cpp11ObjectDeclVisitor::visitClassDecl(const ClassDeclPtr& p)
+{
+    string t;
+    if(p->isLocal() && findMetaData("cpp11:type", p, t))
+    {
+        return;
+    }
+    string name = fixKwd(p->name());
+    string scoped = fixKwd(p->scoped());
+
+
+    if(p->isLocal())
+    {
+        H << sp << nl << "class " << name << ';';
+        H << nl << "typedef ::std::shared_ptr< " << name << "> " << p->name() << "Ptr;";
+    }
+    if(p->isInterface())
+    {
+        H << sp << nl << "class " << name << ';';
+        H << nl << "typedef ::std::shared_ptr< " << name << "> " << p->name() << "Ptr;";
+    }
+    else // Value class
+    {
+        H << sp << nl << "class " << name << ';';
+        H << nl << "typedef ::std::shared_ptr< " << name << "> " << p->name() << "Ptr;";
+        H << nl << _dllExport << "void __patch(" << p->name() << "Ptr&, const ::Ice::ValuePtr&);";
+    }
+}
+
+void
+Slice::Gen::Cpp11ObjectDeclVisitor::visitOperation(const OperationPtr& p)
+{
+    ClassDefPtr cl = ClassDefPtr::dynamicCast(p->container());
+    if(cl && !cl->isLocal())
+    {
+        string flatName = p->flattenedScope() + p->name() + "_name";
+        C << sp << nl << "const ::std::string " << flatName << " = \"" << p->name() << "\";";
+    }
+}
+
+Slice::Gen::Cpp11TypesVisitor::Cpp11TypesVisitor(Output& h, Output& c, const string& dllExport, bool stream) :
+    H(h), C(c), _dllExport(dllExport), _stream(stream), _doneStaticSymbol(false), _useWstring(false)
+{
+}
+
+bool
+Slice::Gen::Cpp11TypesVisitor::visitModuleStart(const ModulePtr& p)
+{
+    if(!p->hasOtherConstructedOrExceptions())
+    {
+        return false;
+    }
+
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+
+    H << sp << nl << "namespace " << fixKwd(p->name()) << nl << '{';
+
+    return true;
+}
+
+void
+Slice::Gen::Cpp11TypesVisitor::visitModuleEnd(const ModulePtr&)
+{
+    H << sp << nl << '}';
+
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+bool
+Slice::Gen::Cpp11TypesVisitor::visitClassDefStart(const ClassDefPtr&)
+{
+    return false;
+}
+
+bool
+Slice::Gen::Cpp11TypesVisitor::visitExceptionStart(const ExceptionPtr& p)
+{
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+
+    string name = fixKwd(p->name());
+    string scoped = fixKwd(p->scoped());
+    ExceptionPtr base = p->base();
+    DataMemberList dataMembers = p->dataMembers();
+    DataMemberList allDataMembers = p->allDataMembers();
+    bool hasDefaultValues = p->hasDefaultValues();
+
+    vector<string> params;
+    vector<string> allTypes;
+    vector<string> allParamDecls;
+    vector<string> baseParams;
+
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        params.push_back(fixKwd((*q)->name()));
+    }
+
+    for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+    {
+        string typeName = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring);
+        allTypes.push_back(typeName);
+        allParamDecls.push_back(typeName + " __ice_" + fixKwd((*q)->name()));
+    }
+
+    if(base)
+    {
+        DataMemberList baseDataMembers = base->allDataMembers();
+        for(DataMemberList::const_iterator q = baseDataMembers.begin(); q != baseDataMembers.end(); ++q)
+        {
+            baseParams.push_back("__ice_" + fixKwd((*q)->name()));
+        }
+    }
+
+    H << sp << nl << "class " << _dllExport << name << " : ";
+    H.useCurrentPosAsIndent();
+    H << "public ";
+    if(!base)
+    {
+        H << (p->isLocal() ? "::Ice::LocalException" : "::Ice::UserException");
+    }
+    else
+    {
+        H << fixKwd(base->scoped());
+    }
+    H.restoreIndent();
+    H << sb;
+
+    H.dec();
+    H << nl << "public:";
+    H.inc();
+
+    H << sp << nl << name << spar;
+    if(p->isLocal())
+    {
+        H << "const char*" << "int";
+    }
+    H << epar;
+    if(!p->isLocal() && !hasDefaultValues)
+    {
+        H << " {}";
+    }
+    else
+    {
+        H << ';';
+    }
+    if(!allTypes.empty())
+    {
+        H << nl;
+        if(!p->isLocal() && allTypes.size() == 1)
+        {
+            H << "explicit ";
+        }
+        H << name << spar;
+        if(p->isLocal())
+        {
+            H << "const char*" << "int";
+        }
+        H << allTypes << epar << ';';
+    }
+    H << nl << "virtual ~" << name << "() throw();";
+    H << sp;
+
+
+    if(!p->isLocal())
+    {
+        string initName = p->flattenedScope() + p->name() + "_init";
+
+        C << sp << nl << "namespace";
+        C << nl << "{";
+
+        C << sp << nl << "const ::IceInternal::DefaultUserExceptionFactoryInit< " << scoped << "> "
+          << initName << "(\"" << p->scoped() << "\");";
+
+        C << sp << nl << "}";
+    }
+
+    if(p->isLocal())
+    {
+        C << sp << nl << scoped.substr(2) << "::" << name << spar << "const char* __file" << "int __line" << epar
+          << " :";
+        C.inc();
+        emitUpcall(base, "(__file, __line)", true);
+        if(p->hasDefaultValues())
+        {
+            C << ", ";
+            writeDataMemberInitializers(C, dataMembers, _useWstring);
+        }
+        C.dec();
+        C << sb;
+        C << eb;
+    }
+    else if(hasDefaultValues)
+    {
+        C << sp << nl << scoped.substr(2) << "::" << name << "() :";
+        C.inc();
+        writeDataMemberInitializers(C, dataMembers, _useWstring);
+        C.dec();
+        C << sb;
+        C << eb;
+    }
+
+    if(!allTypes.empty())
+    {
+        C << sp << nl;
+        C << scoped.substr(2) << "::" << name << spar;
+        if(p->isLocal())
+        {
+            C << "const char* __file" << "int __line";
+        }
+        C << allParamDecls << epar;
+        if(p->isLocal() || !baseParams.empty() || !params.empty())
+        {
+            C << " :";
+            C.inc();
+            string upcall;
+            if(!allParamDecls.empty())
+            {
+                upcall = "(";
+                if(p->isLocal())
+                {
+                    upcall += "__file, __line";
+                }
+                for(vector<string>::const_iterator pi = baseParams.begin(); pi != baseParams.end(); ++pi)
+                {
+                    if(p->isLocal() || pi != baseParams.begin())
+                    {
+                        upcall += ", ";
+                    }
+                    upcall += *pi;
+                }
+                upcall += ")";
+            }
+            if(!params.empty())
+            {
+                upcall += ",";
+            }
+            emitUpcall(base, upcall, p->isLocal());
+        }
+        for(vector<string>::const_iterator pi = params.begin(); pi != params.end(); ++pi)
+        {
+            if(pi != params.begin())
+            {
+                C << ",";
+            }
+            C << nl << *pi << "(__ice_" << *pi << ')';
+        }
+        if(p->isLocal() || !baseParams.empty() || !params.empty())
+        {
+            C.dec();
+        }
+        C << sb;
+        C << eb;
+    }
+
+    C << sp << nl;
+    C << scoped.substr(2) << "::~" << name << "() throw()";
+    C << sb;
+    C << eb;
+
+    H << nl << "virtual ::std::string ice_name() const;";
+    C << sp << nl << "::std::string" << nl << scoped.substr(2) << "::ice_name() const";
+    C << sb;
+    C << nl << "return \"" << p->scoped().substr(2) << "\";";
+    C << eb;
+
+    StringList metaData = p->getMetaData();
+    if(find(metaData.begin(), metaData.end(), "cpp:ice_print") != metaData.end())
+    {
+        H << nl << "virtual void ice_print(::std::ostream&) const;";
+    }
+
+    H << nl << "virtual " << name << "* ice_clone() const;";
+    C << sp << nl << scoped.substr(2) << "*" << nl << scoped.substr(2) << "::ice_clone() const";
+    C << sb;
+    C << nl << "return new " << name << "(*this);";
+    C << eb;
+
+    H << nl << "virtual void ice_throw() const;";
+    C << sp << nl << "void" << nl << scoped.substr(2) << "::ice_throw() const";
+    C << sb;
+    C << nl << "throw *this;";
+    C << eb;
+
+    if(!p->isLocal() && p->usesClasses(false))
+    {
+        if(!base || (base && !base->usesClasses(false)))
+        {
+            H << sp << nl << "virtual bool __usesClasses() const;";
+
+            C << sp << nl << "bool";
+            C << nl << scoped.substr(2) << "::__usesClasses() const";
+            C << sb;
+            C << nl << "return true;";
+            C << eb;
+        }
+    }
+
+    if(!dataMembers.empty())
+    {
+        H << sp;
+    }
+    return true;
+}
+
+void
+Slice::Gen::Cpp11TypesVisitor::visitExceptionEnd(const ExceptionPtr& p)
+{
+    string name = fixKwd(p->name());
+    string scope = fixKwd(p->scope());
+    string scoped = fixKwd(p->scoped());
+    string factoryName;
+
+    if(!p->isLocal())
+    {
+        ExceptionPtr base = p->base();
+        bool basePreserved = p->inheritsMetaData("preserve-slice");
+        bool preserved = p->hasMetaData("preserve-slice");
+
+        if(preserved && !basePreserved)
+        {
+            H << sp << nl << "virtual void __write(::IceInternal::BasicStream*) const;";
+            H << nl << "virtual void __read(::IceInternal::BasicStream*);";
+
+            if(_stream)
+            {
+                H << nl << "virtual void __write(const ::Ice::OutputStreamPtr&) const;";
+                H << nl << "virtual void __read(const ::Ice::InputStreamPtr&);";
+            }
+            else
+            {
+                string baseName = base ? fixKwd(base->scoped()) : string("::Ice::UserException");
+                H << nl << "using " << baseName << "::__write;";
+                H << nl << "using " << baseName << "::__read;";
+            }
+        }
+
+        H.dec();
+        H << sp << nl << "protected:";
+        H.inc();
+
+        H << nl << "virtual void __writeImpl(::IceInternal::BasicStream*) const;";
+        H << nl << "virtual void __readImpl(::IceInternal::BasicStream*);";
+
+        if(_stream)
+        {
+            H << nl << "virtual void __writeImpl(const ::Ice::OutputStreamPtr&) const;";
+            H << nl << "virtual void __readImpl(const ::Ice::InputStreamPtr&);";
+        }
+        else
+        {
+            string baseName = base ? fixKwd(base->scoped()) : string("::Ice::UserException");
+            H << nl << "using " << baseName << "::__writeImpl;";
+            H << nl << "using " << baseName << "::__readImpl;";
+        }
+
+        if(preserved && !basePreserved)
+        {
+
+            H << sp << nl << "::Ice::SlicedDataPtr __slicedData;";
+
+            C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(::IceInternal::BasicStream* __os) const";
+            C << sb;
+            C << nl << "__os->startWriteException(__slicedData);";
+            C << nl << "__writeImpl(__os);";
+            C << nl << "__os->endWriteException();";
+            C << eb;
+
+            C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::BasicStream* __is)";
+            C << sb;
+            C << nl << "__is->startReadException();";
+            C << nl << "__readImpl(__is);";
+            C << nl << "__slicedData = __is->endReadException(true);";
+            C << eb;
+        }
+
+        C << sp << nl << "void" << nl << scoped.substr(2) << "::__writeImpl(::IceInternal::BasicStream* __os) const";
+        C << sb;
+        C << nl << "__os->startWriteSlice(\"" << p->scoped() << "\", -1, " << (!base ? "true" : "false") << ");";
+        writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), true);
+        C << nl << "__os->endWriteSlice();";
+        if(base)
+        {
+            emitUpcall(base, "::__writeImpl(__os);");
+        }
+        C << eb;
+
+        C << sp << nl << "void" << nl << scoped.substr(2) << "::__readImpl(::IceInternal::BasicStream* __is)";
+        C << sb;
+        C << nl << "__is->startReadSlice();";
+        writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), false);
+        C << nl << "__is->endReadSlice();";
+        if(base)
+        {
+            emitUpcall(base, "::__readImpl(__is);");
+        }
+        C << eb;
+
+        if(_stream)
+        {
+            if(preserved && !basePreserved)
+            {
+                C << sp << nl << "void" << nl << scoped.substr(2) << "::__write(const ::Ice::OutputStreamPtr& __os) const";
+                C << sb;
+                C << nl << "__os->startException(__slicedData);";
+                C << nl << "__writeImpl(__os);";
+                C << nl << "__os->endException();";
+                C << eb;
+
+                C << sp << nl << "void" << nl << scoped.substr(2) << "::__read(const ::Ice::InputStreamPtr& __is)";
+                C << sb;
+                C << nl << "__is->startException();";
+                C << nl << "__readImpl(__is);";
+                C << nl << "__slicedData = __is->endException(true);";
+                C << eb;
+            }
+
+            C << sp << nl << "void" << nl << scoped.substr(2)
+              << "::__writeImpl(const ::Ice::OutputStreamPtr& __os) const";
+            C << sb;
+            C << nl << "__os->startSlice(\"" << p->scoped() << "\", -1, " << (!base ? "true" : "false") << ");";
+            writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), true);
+            C << nl << "__os->endSlice();";
+            if(base)
+            {
+                emitUpcall(base, "::__writeImpl(__os);");
+            }
+            C << eb;
+
+            C << sp << nl << "void" << nl << scoped.substr(2)
+              << "::__readImpl(const ::Ice::InputStreamPtr& __is)";
+            C << sb;
+            C << nl << "__is->startSlice();";
+            writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), false);
+            C << nl << "__is->endSlice();";
+            if(base)
+            {
+                emitUpcall(base, "::__readImpl(__is);");
+            }
+            C << eb;
+        }
+    }
+    H << eb << ';';
+
+    if(!p->isLocal())
+    {
+        //
+        // We need an instance here to trigger initialization if the implementation is in a shared libarry.
+        // But we do this only once per source file, because a single instance is sufficient to initialize
+        // all of the globals in a shared library.
+        //
+        if(!_doneStaticSymbol)
+        {
+            _doneStaticSymbol = true;
+            H << sp << nl << "static " << name << " __" << p->name() << "_init;";
+        }
+    }
+
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+bool
+Slice::Gen::Cpp11TypesVisitor::visitStructStart(const StructPtr& p)
+{
+    DataMemberList dataMembers = p->dataMembers();
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+
+    string name = fixKwd(p->name());
+
+
+    H << sp << nl << "struct " << name;
+    H << sb;
+    
+    return true;
+}
+
+void
+Slice::Gen::Cpp11TypesVisitor::visitStructEnd(const StructPtr& p)
+{
+    string name = fixKwd(p->name());
+    string scoped = fixKwd(p->scoped());
+    string scope = fixKwd(p->scope());
+
+    DataMemberList dataMembers = p->dataMembers();
+
+    vector<string> params;
+    vector<string>::const_iterator pi;
+
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        params.push_back(fixKwd((*q)->name()));
+    }
+
+    bool containsSequence = false;
+    if((Dictionary::legalKeyType(p, containsSequence) && !containsSequence))
+    {
+        H << sp << nl << "bool operator==(const " << name << "& __rhs) const";
+        H << sb;
+        H << nl << "if(this == &__rhs)";
+        H << sb;
+        H << nl << "return true;";
+        H << eb;
+        for(vector<string>::const_iterator pi = params.begin(); pi != params.end(); ++pi)
+        {
+            H << nl << "if(" << *pi << " != __rhs." << *pi << ')';
+            H << sb;
+            H << nl << "return false;";
+            H << eb;
+        }
+        H << nl << "return true;";
+        H << eb;
+        H << sp << nl << "bool operator<(const " << name << "& __rhs) const";
+        H << sb;
+        H << nl << "if(this == &__rhs)";
+        H << sb;
+        H << nl << "return false;";
+        H << eb;
+        for(vector<string>::const_iterator pi = params.begin(); pi != params.end(); ++pi)
+        {
+            H << nl << "if(" << *pi << " < __rhs." << *pi << ')';
+            H << sb;
+            H << nl << "return true;";
+            H << eb;
+            H << nl << "else if(__rhs." << *pi << " < " << *pi << ')';
+            H << sb;
+            H << nl << "return false;";
+            H << eb;
+        }
+        H << nl << "return false;";
+        H << eb;
+
+        H << sp << nl << "bool operator!=(const " << name << "& __rhs) const";
+        H << sb;
+        H << nl << "return !operator==(__rhs);";
+        H << eb;
+        H << nl << "bool operator<=(const " << name << "& __rhs) const";
+        H << sb;
+        H << nl << "return operator<(__rhs) || operator==(__rhs);";
+        H << eb;
+        H << nl << "bool operator>(const " << name << "& __rhs) const";
+        H << sb;
+        H << nl << "return !operator<(__rhs) && !operator==(__rhs);";
+        H << eb;
+        H << nl << "bool operator>=(const " << name << "& __rhs) const";
+        H << sb;
+        H << nl << "return !operator<(__rhs);";
+        H << eb;
+    }
+    H << eb << ';';
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+void
+Slice::Gen::Cpp11TypesVisitor::visitDataMember(const DataMemberPtr& p)
+{
+    string name = fixKwd(p->name());
+    H << nl << typeToString(p->type(), p->optional(), p->getMetaData(), _useWstring, true) << ' ' << name;
+    
+    string defaultValue = p->defaultValue();
+    if(!defaultValue.empty())
+    {
+        H << " = ";
+        writeConstantValue(H, p->type(), p->defaultValueType(), defaultValue, _useWstring, p->getMetaData(), true);
+    }
+    
+    H << ';';
+}
+
+void
+Slice::Gen::Cpp11TypesVisitor::visitSequence(const SequencePtr& p)
+{
+    string name = fixKwd(p->name());
+    TypePtr type = p->type();
+    string s = typeToString(type, p->typeMetaData(), _useWstring, true);
+    StringList metaData = p->getMetaData();
+
+    string seqType = findMetaData(metaData, _useWstring);
+    H << sp;
+
+    if(!seqType.empty())
+    {
+        H << nl << "typedef " << seqType << ' ' << name << ';';
+    }
+    else
+    {
+        H << nl << "typedef ::std::vector<" << (s[0] == ':' ? " " : "") << s << "> " << name << ';';
+    }
+}
+
+void
+Slice::Gen::Cpp11TypesVisitor::visitDictionary(const DictionaryPtr& p)
+{
+    string name = fixKwd(p->name());
+    string dictType = findMetaData(p->getMetaData());
+
+    if(dictType.empty())
+    {
+        //
+        // A default std::map dictionary
+        //
+
+        TypePtr keyType = p->keyType();
+        TypePtr valueType = p->valueType();
+        string ks = typeToString(keyType, p->keyMetaData(), _useWstring);
+        if(ks[0] == ':')
+        {
+            ks.insert(0, " ");
+        }
+        string vs = typeToString(valueType, p->valueMetaData(), _useWstring);
+
+        H << sp << nl << "typedef ::std::map<" << ks << ", " << vs << "> " << name << ';';
+    }
+    else
+    {
+        //
+        // A custom dictionary
+        //
+        H << sp << nl << "typedef " << dictType << ' ' << name << ';';
+    }
+}
+
+Slice::Gen::Cpp11ProxyDeclVisitor::Cpp11ProxyDeclVisitor(Output& h, Output&, const string& dllExport) :
+    H(h), _dllExport(dllExport)
+{
+}
+
+bool
+Slice::Gen::Cpp11ProxyDeclVisitor::visitUnitStart(const UnitPtr& p)
+{
+    if(!p->hasNonLocalClassDecls())
+    {
+        return false;
+    }
+    return true;
+}
+
+void
+Slice::Gen::Cpp11ProxyDeclVisitor::visitUnitEnd(const UnitPtr&)
+{
+}
+
+bool
+Slice::Gen::Cpp11ProxyDeclVisitor::visitModuleStart(const ModulePtr& p)
+{
+    if(!p->hasNonLocalClassDecls())
+    {
+        return false;
+    }
+    H << sp << nl << "namespace " << fixKwd(p->name()) << nl << '{';
+    return true;
+}
+
+void
+Slice::Gen::Cpp11ProxyDeclVisitor::visitModuleEnd(const ModulePtr&)
+{
+    H << sp << nl << '}';
+}
+
+void
+Slice::Gen::Cpp11ProxyDeclVisitor::visitClassDecl(const ClassDeclPtr& p)
+{
+    if(!p->isLocal())
+    {
+        string name = fixKwd(p->name());
+        string scoped = fixKwd(p->scoped());
+        
+        ClassDefPtr def = p->definition(); 
+        if(p->isInterface() || (def && !def->allOperations().empty()))
+        {
+            H << nl << "class " << p->name() << "Prx;";
+            H << nl << "typedef ::std::shared_ptr<" << p->name() << "Prx> " << p->name() << "PrxPtr;";
+        }
+    }
+}
+
+
+Slice::Gen::Cpp11ProxyVisitor::Cpp11ProxyVisitor(Output& h, Output& c, const string& dllExport) :
+    H(h), C(c), _dllExport(dllExport), _useWstring(false)
+{
+}
+
+bool
+Slice::Gen::Cpp11ProxyVisitor::visitUnitStart(const UnitPtr& p)
+{
+    return true;
+}
+
+void
+Slice::Gen::Cpp11ProxyVisitor::visitUnitEnd(const UnitPtr&)
+{
+}
+
+bool
+Slice::Gen::Cpp11ProxyVisitor::visitModuleStart(const ModulePtr& p)
+{
+    if(!p->hasNonLocalClassDefs())
+    {
+        return false;
+    }
+
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+
+    string name = fixKwd(p->name());
+
+    H << sp << nl << "namespace " << name << nl << '{';
+
+    return true;
+}
+
+void
+Slice::Gen::Cpp11ProxyVisitor::visitModuleEnd(const ModulePtr&)
+{
+    H << sp << nl << '}';
+
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+bool
+Slice::Gen::Cpp11ProxyVisitor::visitClassDefStart(const ClassDefPtr& p)
+{
+    if(p->isLocal() || (!p->isInterface() && p->allOperations().empty()))
+    {
+        return false;
+    }
+
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+
+    string name = fixKwd(p->name());
+    string scope = fixKwd(p->scope());
+    string scoped = fixKwd(p->scoped());
+    ClassList bases = p->bases();
+    
+    ClassDefPtr base;
+    if(!bases.empty() && !bases.front()->isInterface())
+    {
+        base = bases.front();
+    }
+
+    H << sp << nl << "class " << _dllExport << p->name() << "Prx : ";
+    if(bases.empty() || (base && base->allOperations().empty()))
+    {
+        H << "virtual public ::Ice::ObjectPrx";
+    }
+    else
+    {
+        H.useCurrentPosAsIndent();
+        ClassList::const_iterator q = bases.begin();
+        while(q != bases.end())
+        {
+            H << "virtual public " << fixKwd((*q)->scoped() + "Prx");
+            if(++q != bases.end())
+            {
+                H << ',' << nl;
+            }
+        }
+        H.restoreIndent();
+    }
+
+    H << sb;
+    H.dec();
+    H << nl << "public:";
+    H.inc();
+    return true;
+}
+
+void
+Slice::Gen::Cpp11ProxyVisitor::visitClassDefEnd(const ClassDefPtr& p)
+{
+    //
+    // "Overwrite" various non-virtual functions in ::IceProxy::Ice::Object that return an ObjectPrx and
+    // are more usable when they return a <name>Prx
+    //
+
+    //
+    // No identity!
+    //
+    
+    string prx = fixKwd(p->name() + "Prx");
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_context(const ::Ice::Context& __context) const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(Ice::ObjectPrx::ice_context(__context));";
+    H << eb;
+
+    //
+    // No facet!
+    //
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_adapterId(const ::std::string& __id) const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_adapterId(__id));";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_endpoints(const ::Ice::EndpointSeq& __endpoints) const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_endpoints(__endpoints));";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_locatorCacheTimeout(int __timeout) const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_locatorCacheTimeout(__timeout));";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_connectionCached(bool __cached) const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_connectionCached(__cached));";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_endpointSelection(::Ice::EndpointSelectionType __est) const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_endpointSelection(__est));";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_secure(bool __secure) const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_secure(__secure));";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_preferSecure(bool __preferSecure) const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_preferSecure(__preferSecure));";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_router(const ::Ice::RouterPrxPtr& __router) const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_router(__router));";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_locator(const ::Ice::LocatorPrxPtr& __locator) const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_locator(__locator));";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_collocationOptimized(bool __co) const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_collocationOptimized(__co));";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_invocationTimeout(int __timeout) const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_invocationTimeout(__timeout));";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_twoway() const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_twoway());";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_oneway() const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_oneway());";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_batchOneway() const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_batchOneway());";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_datagram() const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_datagram());";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_batchDatagram() const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_batchDatagram());";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_compress(bool __compress) const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_compress(__compress));";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_timeout(int __timeout) const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_timeout(__timeout));";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_connectionId(const ::std::string& __id) const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_connectionId(__id));";
+    H << eb;
+
+    H << nl << "::std::shared_ptr<" << prx << "> ice_encodingVersion(const ::Ice::EncodingVersion& __v) const";
+    H << sb;
+    H << nl << "return ::std::dynamic_pointer_cast<" << prx << ">(::Ice::ObjectPrx::ice_encodingVersion(__v));";
+    H << eb;
+
+
+    H << sp;
+    H << nl << "static const ::std::string& ice_staticId();";
+    
+    H.dec();
+    H << sp << nl << "private: ";
+    H.inc();
+    H << nl << "virtual ::std::shared_ptr<::Ice::ObjectPrx> __newInstance() const;";
+
+    H << eb << ';';
+
+    string suffix = p->isInterface() ? "" : "Disp";
+    
+
+    string scoped = fixKwd(p->scoped() + "Prx");
+    
+    C << sp;
+    C << nl << "const ::std::string&" << nl << scoped.substr(2) << "::ice_staticId()";
+    C << sb;
+    C << nl << "return "<< fixKwd(p->scope() + p->name() + suffix).substr(2) << "::ice_staticId();";
+    C << eb;
+    
+    C << sp << nl << "::std::shared_ptr<::Ice::ObjectPrx>";
+    C << nl << scoped.substr(2) << "::__newInstance() const";
+    C << sb;
+    C << nl << "return ::std::make_shared<" << prx << ">();";
+    C << eb;
+
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+void
+Slice::Gen::Cpp11ProxyVisitor::visitOperation(const OperationPtr& p)
+{
+    string name = p->name();
+    string flatName = p->flattenedScope() + p->name() + "_name";
+
+    TypePtr ret = p->returnType();
+
+    bool retIsOpt = p->returnIsOptional();
+    string retS = returnTypeToString(ret, retIsOpt, p->getMetaData(), _useWstring | TypeContextAMIEnd, true);
+
+    ContainerPtr container = p->container();
+    ClassDefPtr cl = ClassDefPtr::dynamicCast(container);
+
+    vector<string> params;
+    vector<string> paramsDecl;
+    
+    vector<string> lambdaParams;
+    vector<string> lambdaParamsDecl;
+    
+    vector<string> futureParamsDecl;
+    
+    vector<string> lambdaOutParams;
+    vector<string> lambdaOutParamsDecl;
+    
+    ParamDeclList paramList = p->parameters();
+    ParamDeclList inParams;
+    ParamDeclList outParams;
+    
+    string returnValueS = "returnValue";
+
+    for(ParamDeclList::const_iterator q = paramList.begin(); q != paramList.end(); ++q)
+    {
+        string paramName = fixKwd(paramPrefix + (*q)->name());
+
+        StringList metaData = (*q)->getMetaData();
+        string typeString;
+        string outputTypeString;
+        string typeStringEndAMI;
+        if((*q)->isOutParam())
+        {
+            typeString = typeToString((*q)->type(), (*q)->optional(), metaData, _useWstring, true);
+            outputTypeString = outputTypeToString((*q)->type(), (*q)->optional(), metaData, _useWstring, true);
+        }
+        else
+        {
+            typeString = inputTypeToString((*q)->type(), (*q)->optional(), metaData, _useWstring, true);
+        }
+
+
+        if(!(*q)->isOutParam())
+        {
+            params.push_back(typeString);
+            paramsDecl.push_back(typeString + ' ' + paramName);
+            
+            lambdaParams.push_back(typeString);
+            lambdaParamsDecl.push_back(typeString + ' ' + paramName);
+            
+            futureParamsDecl.push_back(typeString + ' ' + paramName);
+            
+            inParams.push_back(*q);
+        }
+        else
+        {
+            params.push_back(outputTypeString);
+            paramsDecl.push_back(outputTypeString + ' ' + paramName);
+            
+            lambdaOutParams.push_back(typeString);
+            lambdaOutParamsDecl.push_back(typeString + ' ' + paramName);
+            
+            outParams.push_back(*q);
+            if((*q)->name() == "returnValue")
+            {
+                returnValueS = "_returnValue";
+            }
+        }
+    }
+    
+    string scoped = fixKwd(cl->scope() + cl->name() + "Prx" + "::").substr(2);
+
+    string deprecateSymbol = getDeprecateSymbol(p, cl);
+    H << sp << nl << deprecateSymbol << retS << ' ' << fixKwd(name) << spar << paramsDecl
+      << "const ::Ice::Context& __ctx = Ice::noExplicitContext" << epar << ";";
+
+    C << sp;
+    C << nl << retS;
+    C << nl << scoped << fixKwd(p->name()) << spar << paramsDecl << "const ::Ice::Context& __ctx" << epar;
+    C << sb;
+    C << nl << "::std::promise<" << retS << "> __promise;";
+    if(!p->returnsData())
+    {
+        C << nl << "if(ice_isTwoway())";
+        C << sb;
+    }
+
+    C << nl << name << "_async(";
+    C.useCurrentPosAsIndent();
+    for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end();)
+    {
+        C << fixKwd(paramPrefix + (*q)->name()) << ",";
+        if(++q != inParams.end())
+        {
+            C << " ";
+        }
+    }
+    if(!inParams.empty())
+    {
+        C << nl;
+    }
+    C << "[&](";
+    if(retS != "void")
+    {
+        C << retS << " __ret";
+    }
+    if(!outParams.empty())
+    {
+        if(retS != "void")
+        {
+            C << ", ";
+        }
+        for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end();)
+        {
+            C << typeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true)
+              << " " << "__o_" << (*q)->name();
+            if(++q != outParams.end())
+            {
+                C << ",";
+            }
+        }
+    }
+    C << ")";
+    C << sb;
+    if(!outParams.empty())
+    {
+        for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end(); ++q)
+        {
+            C << nl << paramPrefix << (*q)->name() << " = ";
+            bool movable = isMovable((*q)->type());
+            if(movable)
+            {
+                C << "::std::move(";
+            }
+            C << "__o_" << (*q)->name();
+            if(movable)
+            {
+                C << ")";
+            }
+            C << ";";
+        }
+    }
+    C << nl << "__promise.set_value(";
+    if(retS != "void")
+    {
+        C << (isMovable(ret) ? "::std::move(__ret)" : "__ret");
+    }
+    C << ");";
+    C << eb << ",";
+    C << nl << "[&](::std::exception_ptr __ex)";
+    C << sb;
+    C << nl << "__promise.set_exception(::std::move(__ex));";
+    C << eb << ",";
+    C << nl << "nullptr, __ctx);";
+    C.restoreIndent();
+    C << nl;
+    if(retS != "void")
+    {
+        C << "return ";
+    }
+    C << "__promise.get_future().get();";
+    
+    if(!p->returnsData())
+    {
+        C << eb;
+        C << nl << "else if(ice_isOneway() || ice_isDatagram())";
+        C << sb;
+        
+        C << nl << name << "_async(";
+        C.useCurrentPosAsIndent();
+        for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end();)
+        {
+            C << fixKwd(paramPrefix + (*q)->name()) << ",";
+            if(++q != inParams.end())
+            {
+                C << " ";
+            }
+        }
+        if(!inParams.empty())
+        {
+            C << nl;
+        }
+        C << "nullptr,";
+        C << nl << "[&](::std::exception_ptr __ex)";
+        C << sb;
+        C << nl << "__promise.set_exception(::std::move(__ex));";
+        C << eb << ",";
+        C << nl << "[&](bool)";
+        C << sb;
+        C << nl << "__promise.set_value();";
+        C << eb << ",";
+        C << nl << "__ctx);";
+        C.restoreIndent();
+        C << nl << "__promise.get_future().get();";
+        
+        C << eb;
+        C << nl << "else";
+        C << sb;
+        C << nl << name << "_async(";
+        for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end(); ++q)
+        {
+            C << fixKwd(paramPrefix + (*q)->name()) << ",";
+        }
+        C << " nullptr, nullptr, nullptr, __ctx);";
+        C << nl << "__promise.set_value();";
+        C << eb;
+    }
+    
+    C << eb;
+
+    H << sp;
+    H << nl << "::std::function<void ()>";
+    H << nl << name << "_async(";
+    H.useCurrentPosAsIndent();
+    for(vector<string>::const_iterator i = lambdaParams.begin(); i != lambdaParams.end();)
+    {
+        H << *i << ",";
+        if(++i != lambdaParams.end())
+        {
+            H << " ";
+        }
+    }
+    if(!lambdaParams.empty())
+    {
+        H << nl;
+    }
+    H << "::std::function<void (";
+    if(retS != "void")
+    {
+        H << retS;
+        if(!lambdaOutParams.empty())
+        {
+            H << ", ";
+        }
+    }
+    for(vector<string>::const_iterator i = lambdaOutParams.begin(); i != lambdaOutParams.end();)
+    {
+        H << (*i);
+        if(++i != lambdaOutParams.end())
+        {
+            H << ", ";
+        }
+    }
+    H << ")>,";
+    H << nl << "::std::function<void (::std::exception_ptr)> __exception = nullptr,"
+      << nl << "::std::function<void (bool)> __sent = nullptr,"
+      << nl << "const ::Ice::Context& __ctx = Ice::noExplicitContext);";
+    H.restoreIndent();
+
+    C << sp;
+    C << nl << "::std::function<void ()>";
+    C << nl << scoped << fixKwd(p->name() + "_async") << "(";
+    C.useCurrentPosAsIndent();
+    for(vector<string>::const_iterator i = lambdaParamsDecl.begin(); i != lambdaParamsDecl.end();)
+    {
+        C << *i << ",";
+        if(++i != lambdaParamsDecl.end())
+        {
+            C << " ";
+        }
+    }
+    if(!lambdaParamsDecl.empty())
+    {
+        C << nl;
+    }
+    C << "::std::function<void (";
+    if(retS != "void")
+    {
+        C << retS;
+        if(!lambdaOutParams.empty())
+        {
+            C << ", ";
+        }
+    }
+    for(vector<string>::const_iterator i = lambdaOutParams.begin(); i != lambdaOutParams.end();)
+    {
+        C << (*i);
+        if(++i != lambdaOutParams.end())
+        {
+            C << ", ";
+        }
+    }
+    C << ")> __response,";
+    C << nl << "::std::function<void (::std::exception_ptr)> __exception,"
+      << nl << "::std::function<void (bool)> __sent,"
+      << nl << "const ::Ice::Context& __ctx)";
+    C.restoreIndent();
+    C << sb;
+    C << nl << "return ::IceInternal::" << (p->returnsData() ? "Twoway" : "Oneway") << "ClosureCallback::invoke(";
+    C.inc();
+    C << nl << flatName << ", shared_from_this(), "
+      << operationModeToString(p->sendMode(), true) << ", "
+      << opFormatTypeToString(p) << ",";
+    if(inParams.empty())
+    {
+        C << " nullptr,";
+    }
+    else
+    {
+        C << nl << "[&](::IceInternal::BasicStream* __os)";
+        C << sb;
+        writeMarshalCode(C, inParams, 0, true, TypeContextInParam);
+        if(p->sendsClasses(false))
+        {
+            C << nl << "__os->writePendingObjects();";
+        }
+        C << eb << ",";
+    }
+
+    if(p->returnsData())
+    {
+        if(ret || !outParams.empty())
+        {
+            C << nl << "false" << ",";
+            C << nl << "[__response = ::std::move(__response)](::IceInternal::BasicStream* __is)";
+            C << sb;
+            writeAllocateCode(C, outParams, p, true, _useWstring | TypeContextAMIEnd | TypeContextReadClosure, true);
+            writeUnmarshalCode(C, outParams, p, true, _useWstring | TypeContextAMIEnd);
+            if(p->returnsClasses(false))
+            {
+                C << nl << "__is->readPendingObjects();";
+            }
+            C << nl << "__is->endReadEncaps();";
+            C << nl << "if(__response)";
+            C << sb;
+            C << nl << "try";
+            C << sb;
+            C << nl << "__response(";
+            if(ret)
+            {
+                C << (isMovable(ret) ? "::std::move(__ret)" : "__ret");
+                if(!outParams.empty())
+                {
+                    C << ", ";
+                }
+            }
+            for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end();)
+            {
+                string p = fixKwd(paramPrefix + (*q)->name());
+                C << (isMovable((*q)->type()) ? ("::std::move(" + p + ")") : p);
+                if(++q != outParams.end())
+                {
+                    C << ",";
+                }
+            }
+            C << ");";
+            C << eb;
+            C << nl << "catch(...)";
+            C << sb;
+            C << nl << "throw std::current_exception();";
+            C << eb;
+            C << eb;
+            C << eb << ","; 
+        }
+        else
+        {
+            C << nl << "true" << ",";
+            C << nl << "[__response](::IceInternal::BasicStream*)";
+            C << sb;
+            C << nl << "if(__response)";
+            C << sb;
+            C << nl << "try";
+            C << sb;
+            C << nl << "__response();";
+            C << eb;
+            C << nl << "catch(...)";
+            C << sb;
+            C << nl << "throw std::current_exception();";
+            C << eb;
+            C << eb;
+            C << eb << ","; 
+        }
+
+        ExceptionList throws = p->throws();
+        if(!throws.empty())
+        {
+            throws.sort();
+            throws.unique();
+            
+            //
+            // Arrange exceptions into most-derived to least-derived order. If we don't
+            // do this, a base exception handler can appear before a derived exception
+            // handler, causing compiler warnings and resulting in the base exception
+            // being marshaled instead of the derived exception.
+            //
+            
+#if defined(__SUNPRO_CC)
+            throws.sort(derivedToBaseCompare);
+#else
+            throws.sort(Slice::DerivedToBaseCompare());
+#endif
+            C << nl << "[](const ::Ice::UserException& __ex)";
+            C << sb;
+            C << nl << "try";
+            C << sb;
+            C << nl << "__ex.ice_throw();";
+            C << eb;
+            //
+            // Generate a catch block for each legal user exception.
+            //
+            for(ExceptionList::const_iterator i = throws.begin(); i != throws.end(); ++i)
+            {
+                string scoped = (*i)->scoped();
+                C << nl << "catch(const " << fixKwd((*i)->scoped()) << "&)";
+                C << sb;
+                C << nl << "throw;";
+                C << eb;
+            }
+            C << nl << "catch(const ::Ice::UserException&)";
+            C << sb;
+            C << eb;
+            C << eb << ",";
+        }
+        else
+        {
+            C << nl << "nullptr, ";
+        }
+    }
+    else
+    {
+        C <<  nl << "__response,";
+    }
+    C << nl << "::std::move(__exception), ::std::move(__sent), __ctx);";
+    C.dec();
+    C << eb;
+    
+    string futureT;
+    
+    if(retS == "void" && outParams.empty())
+    {
+        futureT = "void";
+    }
+    else if(outParams.empty())
+    {
+        futureT = retS;
+    }
+    else if(retS == "void" && outParams.size() == 1)
+    {
+        ParamDeclPtr param = outParams.front();
+        futureT = typeToString(param->type(), param->optional(), param->getMetaData(), _useWstring, true);
+    }
+    else
+    {
+        futureT = "Result_" + name;
+    }
+    
+    if(futureT.find("Result_") == 0)
+    {
+        // We need to generate a Result_ struct.
+        H << sp;
+        H << nl << "struct Result_" << name;
+        H << sb;
+        if(retS != "void")
+        {
+            H << nl << retS << " " << returnValueS << ";";
+        }
+        for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end(); ++q)
+        {
+            H << nl << typeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true)
+              << " " << (*q)->name() << ";";
+        }
+        H << eb << ";";
+    }
+    
+    H << sp;
+    H << nl << "template<template<typename> class P = ::std::promise>";
+    H << nl << deprecateSymbol << "auto " << name << "_async" << spar << futureParamsDecl
+      << "const ::Ice::Context& __ctx = Ice::noExplicitContext" << epar;
+    H.inc();
+    H << nl << "-> decltype(::std::declval<P<" << futureT << ">>().get_future())";
+    H.dec();
+    H << sb;
+    H << nl << "using Promise = P<" << futureT << ">;";
+    H << nl << "auto __promise = ::std::make_shared<Promise>();";
+    if(!p->returnsData())
+    {
+        H << nl << "if(ice_isTwoway())";
+        H << sb;
+    }
+    H << nl << name << "_async(";
+    H.useCurrentPosAsIndent();
+    for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end();)
+    {
+        H << fixKwd(paramPrefix + (*q)->name()) << ",";
+        if(++q != inParams.end())
+        {
+            H << " ";
+        }
+    }
+    if(!inParams.empty())
+    {
+        H << nl;
+    }
+    H << "[__promise](";
+    
+    if(retS != "void")
+    {
+        H << retS << " __ret";
+        if(!lambdaOutParams.empty())
+        {
+            H << ", ";
+        }
+    }
+    for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end();)
+    {
+        H << typeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true)
+          << " " << paramPrefix << (*q)->name();
+        if(++q != outParams.end())
+        {
+            H << ",";
+        }
+    }
+    H << ")";
+    H << sb;
+    if(retS == "void" && outParams.empty())
+    {
+        H << nl << "__promise->set_value();";
+    }
+    else if(outParams.empty())
+    {
+        H << nl << "__promise->set_value(" << (isMovable(ret) ? "::std::move(__ret)" : "__ret") << ");";
+    }
+    else if(retS == "void" && outParams.size() == 1)
+    {
+        H << nl << "__promise->set_value(" << paramPrefix << outParams.front()->name() << ");";
+    }
+    else
+    {
+        H << nl << "Result_" << name << " __result;";
+        if(retS != "void")
+        {
+            H << nl << "__result." << returnValueS << " = " << (isMovable(ret) ? "::std::move(__ret)" : "__ret") << ";";
+        }
+        for(ParamDeclList::const_iterator q = outParams.begin(); q != outParams.end(); ++q)
+        {
+            H << nl << "__result." << (*q)->name() << " = "
+              << (isMovable((*q)->type()) ? ("::std::move(" + paramPrefix + (*q)->name() + ")") : (paramPrefix + (*q)->name()))
+              << ";";
+        }
+        H << nl << "__promise->set_value(::std::move(__result));";
+    }
+    
+    H << eb << ",";
+    H << nl << "[__promise](::std::exception_ptr __ex)";
+    H << sb;
+    H << nl << "__promise->set_exception(::std::move(__ex));";
+    H << eb << ",";
+    H << nl << "nullptr, __ctx);";
+    H.restoreIndent();
+    
+    if(!p->returnsData())
+    {
+        H << eb;
+        H << nl << "else if(ice_isOneway() || ice_isDatagram())";
+        H << sb;
+        
+        H << nl << name << "_async(";
+        H.useCurrentPosAsIndent();
+        for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end();)
+        {
+            H << fixKwd(paramPrefix + (*q)->name()) << ",";
+            if(++q != inParams.end())
+            {
+                H << " ";
+            }
+        }
+        H << nl << "nullptr,";
+        H << nl << "[__promise](::std::exception_ptr __ex)";
+        H << sb;
+        H << nl << "__promise->set_exception(::std::move(__ex));";
+        H << eb << ",";
+        H << nl << "[__promise](bool)";
+        H << sb;
+        H << nl << "__promise->set_value();";
+        H << eb << ",";
+        H << nl << "__ctx);";
+        H.restoreIndent();
+    
+        H << eb;
+        H << nl << "else";
+        H << sb;
+        H << nl << name << "_async(";
+        for(ParamDeclList::const_iterator q = inParams.begin(); q != inParams.end(); ++q)
+        {
+            H << fixKwd(paramPrefix + (*q)->name()) << ",";
+        }
+        H << "nullptr, nullptr, nullptr, __ctx);";
+        H << eb;
+    }
+    
+    H << nl << "return __promise->get_future();";
+    H << eb;
+}
+
+
+namespace
+{
+
+string
+enumSizeType(IceUtil::Int64 size)
+{
+    if(size <= 0xFF)
+    {
+        return "char";
+    }
+    else if(size <= 0xFFFF)
+    {
+        return "short";
+    }
+    else if(size <= 0xFFFFFFFF)
+    {
+        return "int";
+    }
+    else
+    {
+        return "long long int";
+    }
+}
+
+};
+
+void
+Slice::Gen::Cpp11TypesVisitor::visitEnum(const EnumPtr& p)
+{
+    bool unscoped = findMetaData(p->getMetaData()) == "%unscoped";
+    H << sp << nl << "enum ";
+    if(!unscoped)
+    {
+        H << "class ";
+    }
+    H << fixKwd(p->name());
+    if(!unscoped)
+    {
+        H << " : " << enumSizeType(p->maxValue());
+    }
+    H << sb;
+
+    EnumeratorList enumerators = p->getEnumerators();
+    //
+    // Check if any of the enumerators were assigned an explicit value.
+    //
+    const bool explicitValue = p->explicitValue();
+    for(EnumeratorList::const_iterator en = enumerators.begin(); en != enumerators.end();)
+    {
+        H << nl << fixKwd((*en)->name());
+        //
+        // If any of the enumerators were assigned an explicit value, we emit
+        // an explicit value for *all* enumerators.
+        //
+        if(explicitValue)
+        {
+            H << " = " << int64ToString((*en)->value());
+        }
+        if(++en != enumerators.end())
+        {
+            H << ',';
+        }
+    }
+    H << eb << ';';
+}
+
+void
+Slice::Gen::Cpp11TypesVisitor::visitConst(const ConstPtr& p)
+{
+    H << sp;
+    H << nl << (isConstexprType(p->type()) ? "constexpr " : "const ") << typeToString(p->type(), p->typeMetaData(), _useWstring, true) << " " << fixKwd(p->name())
+      << " = ";
+    writeConstantValue(H, p->type(), p->valueType(), p->value(), _useWstring, p->typeMetaData(), true);
+    H << ';';
+}
+
+void
+Slice::Gen::Cpp11TypesVisitor::emitUpcall(const ExceptionPtr& base, const string& call, bool isLocal)
+{
+    C << nl << (base ? fixKwd(base->scoped()) : string(isLocal ? "::Ice::LocalException" : "::Ice::UserException"))
+      << call;
+}
+
+Slice::Gen::Cpp11ObjectVisitor::Cpp11ObjectVisitor(::IceUtilInternal::Output& h,
+                                                   ::IceUtilInternal::Output& c,
+                                                   const std::string& dllExport,
+                                                   bool stream) :
+    H(h),
+    C(c),
+    _dllExport(dllExport),
+    _stream(stream),
+    _doneStaticSymbol(false),
+    _useWstring(false)
+{
+}
+
+void
+Slice::Gen::Cpp11ObjectVisitor::emitDataMember(const DataMemberPtr& p)
+{
+    string name = fixKwd(p->name());
+    H << sp << nl << typeToString(p->type(), p->optional(), p->getMetaData(), _useWstring, true) << ' ' << name << ';';
+}
+
+void
+Slice::Gen::Cpp11InterfaceVisitor::emitUpcall(const ClassDefPtr& base, const string& call)
+{
+    C << nl << (base ? fixKwd(base->scoped()) : string("::Ice::Object")) << call;
+}
+
+void
+Slice::Gen::Cpp11ValueVisitor::emitUpcall(const ClassDefPtr& base, const string& call)
+{
+    C << nl << (base ? fixKwd(base->scoped()) : string("::Ice::Value")) << call;
+}
+
+Slice::Gen::Cpp11LocalObjectVisitor::Cpp11LocalObjectVisitor(::IceUtilInternal::Output& h,
+                                                             ::IceUtilInternal::Output& c,
+                                                             const std::string& dllExport,
+                                                             bool stream) :
+    Cpp11ObjectVisitor(h, c, dllExport, stream)
+{
+}
+
+bool
+Slice::Gen::Cpp11LocalObjectVisitor::visitModuleStart(const ModulePtr& p)
+{
+    if(!p->hasLocalClassDefs())
+    {
+        return false;
+    }
+    
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+    string name = fixKwd(p->name());
+    H << sp << nl << "namespace " << name << nl << '{';
+    return true;
+}
+
+void
+Slice::Gen::Cpp11LocalObjectVisitor::visitModuleEnd(const ModulePtr&)
+{    
+    H << sp;
+    H << nl << '}';
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+bool
+Slice::Gen::Cpp11LocalObjectVisitor::visitClassDefStart(const ClassDefPtr& p)
+{
+    if(!p->isLocal())
+    {
+        return false;
+    }
+    string t;
+    if(findMetaData("cpp11:type:", p->getMetaData(), t))
+    {
+        H << sp << "typedef " << t << " " << fixKwd(p->name()) << ";";
+        return false;
+    }
+    string name = fixKwd(p->name());
+    string scope = fixKwd(p->scope());
+    string scoped = fixKwd(p->scoped());
+    ClassList bases = p->bases();
+    ClassDefPtr base;
+    if(!bases.empty() && !bases.front()->isInterface())
+    {
+        base = bases.front();
+    }
+    DataMemberList dataMembers = p->dataMembers();
+    DataMemberList allDataMembers = p->allDataMembers();
+
+    H << sp << nl << "class " << _dllExport << name;
+    H.useCurrentPosAsIndent();
+    if(!bases.empty())
+    {
+        H << " : ";
+        ClassList::const_iterator q = bases.begin();
+        bool virtualInheritance = p->isInterface();
+        while(q != bases.end())
+        {
+            if(virtualInheritance || (*q)->isInterface())
+            {
+                H << "virtual ";
+            }
+
+            H << "public " << fixKwd((*q)->scoped());
+            if(++q != bases.end())
+            {
+                H << ',' << nl;
+            }
+        }
+    }
+
+    H.restoreIndent();
+    H << sb;
+    H.dec();
+    H << nl << "public:" << sp;
+    H.inc();
+
+    //
+    // In C++, a nested type cannot have the same name as the enclosing type
+    //
+    if(p->name() != "PointerType")
+    {
+        H << nl << "typedef " << p->name() << "Ptr PointerType;";
+    }
+
+    vector<string> params;
+    vector<string> allTypes;
+    vector<string> allParamDecls;
+
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        params.push_back(fixKwd((*q)->name()));
+    }
+
+    for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+    {
+        string typeName = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring);
+        allTypes.push_back(typeName);
+        allParamDecls.push_back(typeName + " __ice_" + (*q)->name());
+    }
+
+    if(!p->isInterface())
+    {
+        if(p->hasDefaultValues())
+        {
+            H << sp << nl << name << "() :";
+            H.inc();
+            writeDataMemberInitializers(H, dataMembers, _useWstring);
+            H.dec();
+            H << sb;
+            H << eb;
+        }
+        else
+        {
+            H << sp << nl << name << "()";
+            H << sb << eb;
+        }
+
+        emitOneShotConstructor(p);
+        H << sp;
+    }
+    return true;
+}
+
+void
+Slice::Gen::Cpp11LocalObjectVisitor::visitClassDefEnd(const ClassDefPtr& p)
+{
+    string scoped = fixKwd(p->scoped());
+    string scope = fixKwd(p->scope());
+    ClassList bases = p->bases();
+    ClassDefPtr base;
+    if(!bases.empty() && !bases.front()->isInterface())
+    {
+        base = bases.front();
+    }
+
+    //
+    // Emit data members. Access visibility may be specified by metadata.
+    //
+    bool inProtected = true;
+    DataMemberList dataMembers = p->dataMembers();
+    bool prot = p->hasMetaData("protected");
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        if(prot || (*q)->hasMetaData("protected"))
+        {
+            if(!inProtected)
+            {
+                H.dec();
+                H << sp << nl << "protected:";
+                H.inc();
+                inProtected = true;
+            }
+        }
+        else
+        {
+            if(inProtected)
+            {
+                H.dec();
+                H << sp << nl << "public:";
+                H.inc();
+                inProtected = false;
+            }
+        }
+
+        emitDataMember(*q);
+    }
+
+    if(!p->isAbstract())
+    {
+        if(inProtected)
+        {
+            H.dec();
+            H << sp << nl << "public:";
+            H.inc();
+            inProtected = false;
+        }
+        H << sp << nl << "virtual ~" << fixKwd(p->name()) << "() = default;";
+
+        if(!_doneStaticSymbol)
+        {
+            H << sp << nl << "friend class " << p->name() << "__staticInit;";
+        }
+    }
+
+    H << eb << ';';
+
+    if(!p->isAbstract() && !_doneStaticSymbol)
+    {
+        //
+        // We need an instance here to trigger initialization if the implementation is in a shared library.
+        // But we do this only once per source file, because a single instance is sufficient to initialize
+        // all of the globals in a shared library.
+        //
+        // For a Slice class Foo, we instantiate a dummy class Foo__staticInit instead of using a static
+        // Foo instance directly because Foo has a protected destructor.
+        //
+        H << sp << nl << "class " << p->name() << "__staticInit";
+        H << sb;
+        H.dec();
+        H << nl << "public:";
+        H.inc();
+        H << sp << nl << scoped << " _init;";
+        H << eb << ';';
+        _doneStaticSymbol = true;
+        H << sp << nl << "static " << p->name() << "__staticInit _" << p->name() << "_init;";
+    }
+}
+
+bool
+Slice::Gen::Cpp11LocalObjectVisitor::visitExceptionStart(const ExceptionPtr&)
+{
+    return false;
+}
+
+bool
+Slice::Gen::Cpp11LocalObjectVisitor::visitStructStart(const StructPtr&)
+{
+    return false;
+}
+
+void
+Slice::Gen::Cpp11LocalObjectVisitor::visitOperation(const OperationPtr& p)
+{
+    string name = p->name();
+    string scoped = fixKwd(p->scoped());
+    string scope = fixKwd(p->scope());
+
+    TypePtr ret = p->returnType();
+    string retS = returnTypeToString(ret, p->returnIsOptional(), p->getMetaData(), _useWstring, true);
+
+    string params = "(";
+    string paramsDecl = "(";
+    string args = "(";
+
+    ContainerPtr container = p->container();
+    ClassDefPtr cl = ClassDefPtr::dynamicCast(container);
+    string classScope = fixKwd(cl->scope());
+
+    ParamDeclList inParams;
+    ParamDeclList outParams;
+    ParamDeclList paramList = p->parameters();
+    vector< string> outDecls;
+    for(ParamDeclList::iterator q = paramList.begin(); q != paramList.end(); ++q)
+    {
+        string paramName = fixKwd(string(paramPrefix) + (*q)->name());
+        TypePtr type = (*q)->type();
+        bool isOutParam = (*q)->isOutParam();
+        string typeString;
+        if(isOutParam)
+        {
+            outParams.push_back(*q);
+            typeString = outputTypeToString(type, (*q)->optional(), (*q)->getMetaData(), _useWstring, true);
+        }
+        else
+        {
+            inParams.push_back(*q);
+            typeString = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true);
+        }
+
+        if(q != paramList.begin())
+        {
+            params += ", ";
+            paramsDecl += ", ";
+            args += ", ";
+        }
+
+        params += typeString;
+        paramsDecl += typeString;
+        paramsDecl += ' ';
+        paramsDecl += paramName;
+        args += paramName;
+
+        if(isOutParam)
+        {
+            outDecls.push_back(inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true));
+        }
+    }
+
+    params += ')';
+    paramsDecl += ')';
+    args += ')';
+
+    bool isConst = (p->mode() == Operation::Nonmutating) || p->hasMetaData("cpp:const");
+
+    string deprecateSymbol = getDeprecateSymbol(p, cl);
+
+    H << sp;
+    H << nl << deprecateSymbol << "virtual " << retS << ' ' << fixKwd(name) << params
+      << (isConst ? " const" : "") << " = 0;";
+
+    if(cl->hasMetaData("async") || p->hasMetaData("async"))
+    {
+        vector<string> paramsDeclAMI;
+        vector<string> outParamsDeclAMI;
+
+        ParamDeclList paramList = p->parameters();
+        for(ParamDeclList::const_iterator r = paramList.begin(); r != paramList.end(); ++r)
+        {
+            string paramName = fixKwd((*r)->name());
+
+            StringList metaData = (*r)->getMetaData();
+            string typeString;
+            if((*r)->isOutParam())
+            {
+                typeString = outputTypeToString((*r)->type(), (*r)->optional(), metaData,
+                                                _useWstring | TypeContextAMIEnd, true);
+            }
+            else
+            {
+                typeString = inputTypeToString((*r)->type(), (*r)->optional(), metaData, _useWstring, true);
+            }
+
+            if(!(*r)->isOutParam())
+            {
+                paramsDeclAMI.push_back(typeString + ' ' + paramName);
+            }
+            else
+            {
+                outParamsDeclAMI.push_back(typeString + ' ' + paramName);
+            }
+        }
+        
+        H << sp;
+        H << nl << "virtual ::std::function<void ()>";
+        H << nl << name << "_async(";
+        H.useCurrentPosAsIndent();
+        for(vector<string>::const_iterator i = paramsDeclAMI.begin(); i != paramsDeclAMI.end(); ++i)
+        {
+            H << *i << ",";
+        }
+        if(!paramsDeclAMI.empty())
+        {
+            H << nl;
+        }
+        H << "::std::function<void (";
+        for(vector<string>::const_iterator i = outParamsDeclAMI.begin(); i != outParamsDeclAMI.end();)
+        {
+            H << *i << ",";
+            if(++i != outParamsDeclAMI.end())
+            {
+                H << " ";
+            }
+        }
+        H << ")>,";
+        H << nl << "::std::function<void (::std::exception_ptr)> exception = nullptr,";
+        H << nl << "::std::function<void (bool)> sent = nullptr) = 0;";
+        H.restoreIndent();
+    }
+}
+
+Slice::Gen::Cpp11InterfaceVisitor::Cpp11InterfaceVisitor(::IceUtilInternal::Output& h,
+                                                         ::IceUtilInternal::Output& c,
+                                                         const std::string& dllExport,
+                                                         bool stream) :
+    Cpp11ObjectVisitor(h, c, dllExport, stream)
+{
+}
+
+bool
+Slice::Gen::Cpp11InterfaceVisitor::visitModuleStart(const ModulePtr& p)
+{
+    if(!p->hasNonLocalInterfaceDefs())
+    {
+        return false;
+    }
+    
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+    string name = fixKwd(p->name());
+    H << sp << nl << "namespace " << name << nl << '{';
+    return true;
+}
+
+void
+Slice::Gen::Cpp11InterfaceVisitor::visitModuleEnd(const ModulePtr&)
+{
+    H << sp;
+    H << nl << '}';
+
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+bool
+Slice::Gen::Cpp11InterfaceVisitor::visitClassDefStart(const ClassDefPtr& p)
+{
+    if(p->isLocal() || (!p->isInterface() && p->allOperations().empty()))
+    {
+        return false;
+    }
+
+    string suffix = p->isInterface() ? "" : "Disp";
+
+    string name = fixKwd(p->name() + suffix);
+    string scope = fixKwd(p->scope());
+    string scoped = fixKwd(p->scope() + p->name() + suffix);
+    ClassList bases = p->bases();
+    ClassDefPtr base;
+    if(!bases.empty() && !bases.front()->isInterface())
+    {
+        base = bases.front();
+    }
+    DataMemberList dataMembers = p->dataMembers();
+    DataMemberList allDataMembers = p->allDataMembers();
+
+    H << sp << nl << "class " << _dllExport << name << " : ";
+    H.useCurrentPosAsIndent();
+    if(bases.empty() || (base && base->allOperations().empty()))
+    {
+        H << "virtual public ::Ice::Object";
+    }
+    else
+    {
+        ClassList::const_iterator q = bases.begin();
+        while(q != bases.end())
+        {
+            string baseSuffix = (*q)->isInterface() ? "" : "Disp";
+            string baseScoped = fixKwd((*q)->scope() + (*q)->name() + baseSuffix);
+
+            H << "virtual public " << baseScoped;
+            if(++q != bases.end())
+            {
+                H << ',' << nl;
+            }
+        }
+    }
+
+    H.restoreIndent();
+    H << sb;
+    H.dec();
+    H << nl << "public:" << sp;
+    H.inc();
+
+    //
+    // In C++, a nested type cannot have the same name as the enclosing type
+    //
+    if(name != "ProxyType")
+    {
+        H << nl << "typedef " << p->name() << "Prx ProxyType;";
+    }
+
+    vector<string> params;
+    vector<string> allTypes;
+    vector<string> allParamDecls;
+
+    ClassList allBases = p->allBases();
+    StringList ids;
+#if defined(__IBMCPP__) && defined(NDEBUG)
+    //
+    // VisualAge C++ 6.0 does not see that ClassDef is a Contained,
+    // when inlining is on. The code below issues a warning: better
+    // than an error!
+    //
+    transform(allBases.begin(), allBases.end(), back_inserter(ids), ::IceUtil::constMemFun<string,ClassDef>(&Contained::scoped));
+#else
+    transform(allBases.begin(), allBases.end(), back_inserter(ids), ::IceUtil::constMemFun(&Contained::scoped));
+#endif
+    StringList other;
+    other.push_back(p->scoped());
+    other.push_back("::Ice::Object");
+    other.sort();
+    ids.merge(other);
+    ids.unique();
+    StringList::const_iterator firstIter = ids.begin();
+    StringList::const_iterator scopedIter = find(ids.begin(), ids.end(), p->scoped());
+    assert(scopedIter != ids.end());
+    StringList::difference_type scopedPos = IceUtilInternal::distance(firstIter, scopedIter);
+
+    H << sp;
+    H << nl << "virtual bool ice_isA"
+      << "(const ::std::string&, const ::Ice::Current& = ::Ice::Current()) const;";
+    H << nl << "virtual ::std::vector< ::std::string> ice_ids"
+      << "(const ::Ice::Current& = ::Ice::Current()) const;";
+    H << nl << "virtual const ::std::string& ice_id(const ::Ice::Current& = ::Ice::Current()) const;";
+    H << nl << "static const ::std::string& ice_staticId();";
+
+    string flatName = p->flattenedScope() + p->name() + (p->isInterface() ? "" : "Disp") + "_ids";
+
+    C << sp << nl << "namespace";
+    C << nl << "{";
+    C << nl << "const ::std::string " << flatName << '[' << ids.size() << "] =";
+    C << sb;
+
+    for(StringList::const_iterator r = ids.begin(); r != ids.end();)
+    {
+        C << nl << '"' << *r << '"';
+        if(++r != ids.end())
+        {
+            C << ',';
+        }
+    }
+
+    C << eb << ';';
+    C << sp << nl << "}";
+
+    C << sp;
+    C << nl << "bool" << nl << scoped.substr(2)
+      << "::ice_isA(const ::std::string& _s, const ::Ice::Current&) const";
+    C << sb;
+    C << nl << "return ::std::binary_search(" << flatName << ", " << flatName << " + " << ids.size() << ", _s);";
+    C << eb;
+
+    C << sp;
+    C << nl << "::std::vector< ::std::string>" << nl << scoped.substr(2)
+      << "::ice_ids(const ::Ice::Current&) const";
+    C << sb;
+    C << nl << "return ::std::vector< ::std::string>(&" << flatName << "[0], &" << flatName
+      << '[' << ids.size() << "]);";
+    C << eb;
+
+    C << sp;
+    C << nl << "const ::std::string&" << nl << scoped.substr(2)
+      << "::ice_id(const ::Ice::Current&) const";
+    C << sb;
+    C << nl << "return " << flatName << '[' << scopedPos << "];";
+    C << eb;
+
+    C << sp;
+    C << nl << "const ::std::string&" << nl << scoped.substr(2) << "::ice_staticId()";
+    C << sb;
+    C << nl << "static const ::std::string typeId = \"" << *scopedIter << "\";";
+    C << nl << "return typeId;";
+    C << eb;
+    return true;
+}
+
+void
+Slice::Gen::Cpp11InterfaceVisitor::visitClassDefEnd(const ClassDefPtr& p)
+{
+    string suffix = p->isInterface() ? "" : "Disp";
+    string scoped = fixKwd(p->scope() + p->name() + suffix);
+
+    string scope = fixKwd(p->scope());
+    string name = fixKwd(p->name() + suffix);
+    ClassList bases = p->bases();
+    ClassDefPtr base;
+    if(!bases.empty() && !bases.front()->isInterface())
+    {
+        base = bases.front();
+    }
+
+    OperationList allOps = p->allOperations();
+    if(!allOps.empty())
+    {
+        StringList allOpNames;
+#if defined(__IBMCPP__) && defined(NDEBUG)
+//
+// See comment for transform above
+//
+        transform(allOps.begin(), allOps.end(), back_inserter(allOpNames),
+                    ::IceUtil::constMemFun<string,Operation>(&Contained::name));
+#else
+        transform(allOps.begin(), allOps.end(), back_inserter(allOpNames),
+                    ::IceUtil::constMemFun(&Contained::name));
+#endif
+        allOpNames.push_back("ice_id");
+        allOpNames.push_back("ice_ids");
+        allOpNames.push_back("ice_isA");
+        allOpNames.push_back("ice_ping");
+        allOpNames.sort();
+        allOpNames.unique();
+
+        H << sp;
+        H << nl
+            << "virtual ::Ice::DispatchStatus __dispatch(::IceInternal::Incoming&, const ::Ice::Current&);";
+
+        string flatName = p->flattenedScope() + name + "_all";
+        C << sp << nl << "namespace";
+        C << nl << "{";
+        C << nl << "const ::std::string " << flatName << "[] =";
+        C << sb;
+
+        for(StringList::const_iterator q = allOpNames.begin(); q != allOpNames.end();)
+        {
+            C << nl << '"' << *q << '"';
+            if(++q != allOpNames.end())
+            {
+                C << ',';
+            }
+        }
+        C << eb << ';';
+        C << sp << nl << "}";
+        C << sp;
+        C << nl << "::Ice::DispatchStatus" << nl << scoped.substr(2)
+          << "::__dispatch(::IceInternal::Incoming& in, const ::Ice::Current& current)";
+        C << sb;
+
+        C << nl << "::std::pair< const ::std::string*, const ::std::string*> r = "
+            << "::std::equal_range(" << flatName << ", " << flatName << " + " << allOpNames.size()
+            << ", current.operation);";
+        C << nl << "if(r.first == r.second)";
+        C << sb;
+        C << nl << "throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, "
+            << "current.facet, current.operation);";
+        C << eb;
+        C << sp;
+        C << nl << "switch(r.first - " << flatName << ')';
+        C << sb;
+        int i = 0;
+        for(StringList::const_iterator q = allOpNames.begin(); q != allOpNames.end(); ++q)
+        {
+            C << nl << "case " << i++ << ':';
+            C << sb;
+            C << nl << "return ___" << *q << "(in, current);";
+            C << eb;
+        }
+        C << eb;
+        C << sp;
+        C << nl << "assert(false);";
+        C << nl << "throw ::Ice::OperationNotExistException(__FILE__, __LINE__, current.id, "
+            << "current.facet, current.operation);";
+        C << eb;
+
+        //
+        // Check if we need to generate ice_operationAttributes()
+        //
+        map<string, int> attributesMap;
+        for(OperationList::iterator r = allOps.begin(); r != allOps.end(); ++r)
+        {
+            int attributes = (*r)->attributes();
+            if(attributes != 0)
+            {
+                attributesMap.insert(map<string, int>::value_type((*r)->name(), attributes));
+            }
+        }
+    }
+
+    H << eb << ';';
+}
+
+bool
+Slice::Gen::Cpp11InterfaceVisitor::visitExceptionStart(const ExceptionPtr&)
+{
+    return false;
+}
+
+bool
+Slice::Gen::Cpp11InterfaceVisitor::visitStructStart(const StructPtr&)
+{
+    return false;
+}
+
+void
+Slice::Gen::Cpp11InterfaceVisitor::visitOperation(const OperationPtr& p)
+{
+    string name = p->name();
+    
+    TypePtr ret = p->returnType();
+    string retS = returnTypeToString(ret, p->returnIsOptional(), p->getMetaData(), _useWstring, true);
+
+    string params = "(";
+    string paramsDecl = "(";
+    string args = "(";
+
+    string paramsAMD;
+    string argsAMD;
+
+    string responseParams;
+    string responseParamsDecl;
+
+    ContainerPtr container = p->container();
+    ClassDefPtr cl = ClassDefPtr::dynamicCast(container);
+    string classScope = fixKwd(cl->scope());
+
+    string suffix = cl->isInterface() ? "" : "Disp";
+    string scope = fixKwd(cl->scope() + cl->name() + suffix + "::");
+    string scoped = fixKwd(cl->scope() + cl->name() + suffix + "::" + p->name());
+
+    ParamDeclList inParams;
+    ParamDeclList outParams;
+    ParamDeclList paramList = p->parameters();
+    vector< string> outDecls;
+    for(ParamDeclList::iterator q = paramList.begin(); q != paramList.end(); ++q)
+    {
+        string paramName = fixKwd(string(paramPrefix) + (*q)->name());
+        TypePtr type = (*q)->type();
+        bool isOutParam = (*q)->isOutParam();
+        string typeString;
+        if(isOutParam)
+        {
+            outParams.push_back(*q);
+            typeString = outputTypeToString(type, (*q)->optional(), (*q)->getMetaData(), _useWstring, true);
+            outDecls.push_back(inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true));
+        }
+        else
+        {
+            inParams.push_back(*q);
+            typeString = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true);
+        }
+
+        if(q != paramList.begin())
+        {
+            params += ", ";
+            paramsDecl += ", ";
+            args += ", ";
+        }
+
+        params += typeString;
+        paramsDecl += typeString;
+        paramsDecl += ' ';
+        paramsDecl += paramName;
+        args += paramName;
+    }
+    
+    if(!paramList.empty())
+    {
+        params += ", ";
+        paramsDecl += ", ";
+        args += ", ";
+    }
+
+    params += "const ::Ice::Current& = ::Ice::Current())";
+    paramsDecl += "const ::Ice::Current& __current)";
+    args += "__current)";
+
+    for(ParamDeclList::iterator q = inParams.begin(); q != inParams.end(); ++q)
+    {
+        if(q != inParams.begin())
+        {
+            paramsAMD += ", ";
+            argsAMD += ", ";
+        }
+        paramsAMD += inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true);
+        argsAMD += fixKwd(string(paramPrefix) + (*q)->name());
+    }
+    
+    if(ret)
+    {
+        string typeString = inputTypeToString(ret, p->returnIsOptional(), p->getMetaData(), _useWstring, true);
+        responseParams = typeString;
+        responseParamsDecl = typeString + " __ret";
+        if(!outParams.empty())
+        {
+            responseParams += ", ";
+            responseParamsDecl += ", ";
+        }
+    }
+    
+    for(ParamDeclList::iterator q = outParams.begin(); q != outParams.end(); ++q)
+    {
+        if(q != outParams.begin())
+        {
+            responseParams += ", ";
+            responseParamsDecl += ", ";
+        }
+        string paramName = fixKwd(string(paramPrefix) + (*q)->name());
+        string typeString = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring, true);
+        responseParams += typeString;
+        responseParamsDecl += typeString + " " + paramName;
+    }
+
+    bool isConst = (p->mode() == Operation::Nonmutating) || p->hasMetaData("cpp:const");
+    bool amd = (cl->hasMetaData("amd") || p->hasMetaData("amd"));
+    
+    ExceptionList throws = p->throws();
+    throws.sort();
+    throws.unique();
+
+    //
+    // Arrange exceptions into most-derived to least-derived order. If we don't
+    // do this, a base exception handler can appear before a derived exception
+    // handler, causing compiler warnings and resulting in the base exception
+    // being marshaled instead of the derived exception.
+    //
+#if defined(__SUNPRO_CC)
+    throws.sort(derivedToBaseCompare);
+#else
+    throws.sort(Slice::DerivedToBaseCompare());
+#endif
+        
+    string deprecateSymbol = getDeprecateSymbol(p, cl);
+    H << sp;
+    if(!amd)
+    {
+        H << nl << deprecateSymbol << "virtual " << retS << ' ' << fixKwd(name) << params
+            << (isConst ? " const" : "") << " = 0;";
+    }
+    else
+    {
+        H << nl << deprecateSymbol << "virtual void " << name << "_async(";
+        H.useCurrentPosAsIndent();
+        H << paramsAMD;
+        if(!paramsAMD.empty())
+        {
+            H << "," << nl;
+        }
+        H << "::std::function<void (" << responseParams << ")>," << nl
+          << "::std::function<void (const ::std::exception_ptr&)>, const Ice::Current&)"
+          << (isConst ? " const" : "") << " = 0;";
+        H.restoreIndent();
+    }
+
+    H << sp;
+    H << nl << "::Ice::DispatchStatus ___" << name << "(::IceInternal::Incoming&, const ::Ice::Current&)" 
+      << (isConst ? " const" : "") << ';';
+      
+    C << sp;
+    C << nl << "::Ice::DispatchStatus" << nl << scope.substr(2) << "___" << name << "(::IceInternal::Incoming& __inS"
+      << ", const ::Ice::Current& __current)" << (isConst ? " const" : "");
+    C << sb;
+    C << nl << "__checkMode(" << operationModeToString(p->mode(), true) << ", __current.mode);";
+
+    if(!inParams.empty())
+    {
+        C << nl << "::IceInternal::BasicStream* __is = __inS.startReadParams();";
+        writeAllocateCode(C, inParams, 0, true, _useWstring | TypeContextInParam | TypeContextReadClosure, true);
+        writeUnmarshalCode(C, inParams, 0, true, TypeContextInParam);
+        if(p->sendsClasses(false))
+        {
+            C << nl << "__is->readPendingObjects();";
+        }
+        C << nl << "__inS.endReadParams();";
+    }
+    else
+    {
+        C << nl << "__inS.readEmptyParams();";
+    }
+    
+    if(!amd)
+    {
+        writeAllocateCode(C, outParams, 0, true, _useWstring, true);
+        if(!throws.empty())
+        {
+            C << nl << "try";
+            C << sb;
+        }
+        C << nl;
+        if(ret)
+        {
+            C << retS << " __ret = ";
+        }
+        C << fixKwd(name) << args << ';';
+        if(ret || !outParams.empty())
+        {
+            C << nl << "auto __os = __inS.__startWriteParams(" << opFormatTypeToString(p) << ");";
+            writeMarshalCode(C, outParams, p, true);
+            if(p->returnsClasses(false))
+            {
+                C << nl << "__os->writePendingObjects();";
+            }
+            C << nl << "__inS.__endWriteParams(true);";
+        }
+        else
+        {
+            C << nl << "__inS.__writeEmptyParams();";
+        }
+        C << nl << "return ::Ice::DispatchOK;";
+        if(!throws.empty())
+        {
+            C << eb;
+            ExceptionList::const_iterator r;
+            for(r = throws.begin(); r != throws.end(); ++r)
+            {
+                C << nl << "catch(const " << fixKwd((*r)->scoped()) << "& __ex)";
+                C << sb;
+                C << nl << "__inS.__writeUserException(__ex, " << opFormatTypeToString(p) << ");";
+                C << eb;
+            }
+            C << nl << "return ::Ice::DispatchUserException;";
+        }
+    }
+    else
+    {
+        C << nl << "auto inS = ::std::make_shared<::IceInternal::IncomingAsync>(__inS);";
+        C << nl << "auto __exception = [inS](const ::std::exception_ptr& e)";
+        C << sb;
+        C << nl << "try";
+        C << sb;
+        C << nl << "std::rethrow_exception(e);";
+        C << eb;
+        
+        for(ExceptionList::const_iterator r = throws.begin(); r != throws.end(); ++r)
+        {
+            C << nl << "catch(const " << fixKwd((*r)->scoped()) << "& __ex)";
+            C << sb;
+            C << nl <<"if(inS->__validateResponse(false))";
+            C << sb;
+            C << nl << "inS->__writeUserException(__ex, " << opFormatTypeToString(p) << ");";
+            C << nl << "inS->__response();";
+            C << eb;
+            C << eb;
+        }
+        
+        C << nl << "catch(const ::std::exception& __ex)";
+        C << sb;
+        C << nl << "inS->ice_exception(__ex);";
+        C << eb;
+        C << nl << "catch(...)";
+        C << sb;
+        C << nl << "inS->ice_exception();";        
+        C << eb;
+        C << eb << ";";
+
+        C << nl << "try";
+        C << sb;
+        
+        C << nl << name << "_async(";
+        C.useCurrentPosAsIndent();
+        if(!argsAMD.empty())
+        {
+            C << argsAMD << ",";
+            C << nl;
+        }
+        C << "[inS](" << responseParamsDecl << ")";
+        C << sb;
+        C << nl << "if(inS->__validateResponse(true))";
+        C << sb;
+        if(ret || !outParams.empty())
+        {
+            C << nl << "auto __os = inS->__startWriteParams(" << opFormatTypeToString(p) << ");";
+            writeMarshalCode(C, outParams, p, true);
+            if(p->returnsClasses(false))
+            {
+                C << nl << "__os->writePendingObjects();";
+            }
+            C << nl << "inS->__endWriteParams(true);";
+        }
+        else
+        {
+            C << nl << "inS->__writeEmptyParams();";
+        }
+        C << nl << "inS->__response();";
+        C << eb;
+        C << eb << ",";
+        C << nl << "__exception, __current);";
+        C.restoreIndent();
+        C << eb;
+        C << nl << "catch(...)";
+        C << sb;
+        C << nl << "__exception(std::current_exception());";
+        C << eb;
+        C << nl << "return ::Ice::DispatchAsync;";
+    }
+    C << eb;
+}
+
+Slice::Gen::Cpp11ValueVisitor::Cpp11ValueVisitor(::IceUtilInternal::Output& h,
+                                                 ::IceUtilInternal::Output& c,
+                                                 const std::string& dllExport,
+                                                 bool stream) :
+    Cpp11ObjectVisitor(h, c, dllExport, stream)
+{
+}
+
+bool
+Slice::Gen::Cpp11ValueVisitor::visitModuleStart(const ModulePtr& p)
+{
+    if(!p->hasValueDefs())
+    {
+        return false;
+    }
+    
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+    string name = fixKwd(p->name());
+    H << sp << nl << "namespace " << name << nl << '{';
+    return true;
+}
+
+void
+Slice::Gen::Cpp11ValueVisitor::visitModuleEnd(const ModulePtr&)
+{
+    H << sp;
+    H << nl << '}';
+
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+bool
+Slice::Gen::Cpp11ValueVisitor::visitClassDefStart(const ClassDefPtr& p)
+{
+    if(p->isLocal() || p->isInterface())
+    {
+        return false;
+    }
+    _useWstring = setUseWstring(p, _useWstringHist, _useWstring);
+
+    string name = fixKwd(p->name());
+    string scope = fixKwd(p->scope());
+    string scoped = fixKwd(p->scoped());
+    ClassList bases = p->bases();
+    ClassDefPtr base;
+    if(!bases.empty())
+    {
+        base = bases.front();
+    }
+    DataMemberList dataMembers = p->dataMembers();
+    DataMemberList allDataMembers = p->allDataMembers();
+
+    H << sp << nl << "class " << _dllExport << name << " : ";
+    H.useCurrentPosAsIndent();
+    if(!base || (base && base->isInterface()))
+    {
+        H << "public ::Ice::Value";
+    }
+    else
+    {
+        H << "public " << fixKwd(base->scoped());
+    }
+
+    H.restoreIndent();
+    H << sb;
+    H.dec();
+    H << nl << "public:" << sp;
+    H.inc();
+
+    //
+    // In C++, a nested type cannot have the same name as the enclosing type
+    //
+
+    if(p->name() != "PointerType")
+    {
+        H << nl << "typedef " << p->name() << "Ptr PointerType;";
+    }
+
+    vector<string> params;
+    vector<string> allTypes;
+    vector<string> allParamDecls;
+
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        params.push_back(fixKwd((*q)->name()));
+    }
+
+    for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+    {
+        string typeName = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring);
+        allTypes.push_back(typeName);
+        allParamDecls.push_back(typeName + " __ice_" + (*q)->name());
+    }
+
+    if(p->hasDefaultValues())
+    {
+        H << sp << nl << name << "() :";
+        H.inc();
+        writeDataMemberInitializers(H, dataMembers, _useWstring);
+        H.dec();
+        H << sb;
+        H << eb;
+    }
+    else
+    {
+        H << sp << nl << name << "()";
+        H << sb << eb;
+    }
+
+    emitOneShotConstructor(p);
+    H << sp;
+    H << nl << "virtual ::Ice::ValuePtr ice_clone() const;";
+    H << sp;
+    H << nl << "static const ::std::string& ice_staticId();";
+    return true;
+}
+
+void
+Slice::Gen::Cpp11ValueVisitor::visitClassDefEnd(const ClassDefPtr& p)
+{
+    string scoped = fixKwd(p->scoped());
+    string scope = fixKwd(p->scope());
+    ClassList bases = p->bases();
+    ClassDefPtr base;
+    if(!bases.empty() && !bases.front()->isInterface())
+    {
+        base = bases.front();
+    }
+    bool basePreserved = p->inheritsMetaData("preserve-slice");
+    bool preserved = p->hasMetaData("preserve-slice");
+
+    if(preserved && !basePreserved)
+    {
+        H << sp;
+        H << nl << "virtual void __write(::IceInternal::BasicStream*) const;";
+        H << nl << "virtual void __read(::IceInternal::BasicStream*);";
+    }
+
+    H.dec();
+    H << sp << nl << "protected:";
+    H.inc();
+
+    H << nl << "virtual void __writeImpl(::IceInternal::BasicStream*) const;";
+    H << nl << "virtual void __readImpl(::IceInternal::BasicStream*);";
+
+    if(preserved && !basePreserved)
+    {
+        C << sp;
+        C << nl << "void" << nl << scoped.substr(2)
+          << "::__write(::IceInternal::BasicStream* __os) const";
+        C << sb;
+        C << nl << "__os->startWriteObject(__slicedData);";
+        C << nl << "__writeImpl(__os);";
+        C << nl << "__os->endWriteObject();";
+        C << eb;
+
+        C << sp;
+        C << nl << "void" << nl << scoped.substr(2) << "::__read(::IceInternal::BasicStream* __is)";
+        C << sb;
+        C << nl << "__is->startReadObject();";
+        C << nl << "__readImpl(__is);";
+        C << nl << "__slicedData = __is->endReadObject(true);";
+        C << eb;
+    }
+
+    C << sp;
+    C << nl << "void" << nl << scoped.substr(2)
+      << "::__writeImpl(::IceInternal::BasicStream* __os) const";
+    C << sb;
+    C << nl << "__os->startWriteSlice(ice_staticId(), " << p->compactId() << (!base ? ", true" : ", false") << ");";
+    writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), true);
+    C << nl << "__os->endWriteSlice();";
+    if(base)
+    {
+        emitUpcall(base, "::__writeImpl(__os);");
+    }
+    C << eb;
+
+    C << sp;
+    C << nl << "void" << nl << scoped.substr(2) << "::__readImpl(::IceInternal::BasicStream* __is)";
+    C << sb;
+    C << nl << "__is->startReadSlice();";
+    writeMarshalUnmarshalDataMembers(C, p->dataMembers(), p->orderedOptionalDataMembers(), false);
+    C << nl << "__is->endReadSlice();";
+    if(base)
+    {
+        emitUpcall(base, "::__readImpl(__is);");
+    }
+    C << eb;
+    
+    C << sp;
+    C << nl << "::Ice::ValuePtr";
+    C << nl << scoped.substr(2) << "::ice_clone() const";
+    C << sb;
+    C << nl << "return ::std::make_shared<" << scoped << ">(*this);";
+    C << eb;
+    
+    C << sp;
+    C << nl << "const ::std::string&" << nl << scoped.substr(2) << "::ice_staticId()";
+    C << sb;
+    C << nl << "static const ::std::string typeId = \"" << p->scoped() << "\";";
+    C << nl << "return typeId;";
+    C << eb;
+
+    C << sp << nl << "namespace";
+    C << nl << "{";
+
+    string initName = p->flattenedScope() + p->name() + "_init";
+    C << sp << nl << "const ::IceInternal::DefaultObjectFactoryInit< " << scoped << "> "
+        << initName << "(\"" << p->scoped() << "\");";
+
+    if(p->compactId() >= 0)
+    {
+        string initName = p->flattenedScope() + p->name() + "_compactIdInit";
+        C << sp << nl << "const ::IceInternal::CompactIdInit "
+            << initName << "(\"" << p->scoped() << "\", " << p->compactId() << ");";
+    }
+    C << nl << "}";
+
+    //
+    // Emit data members. Access visibility may be specified by metadata.
+    //
+    bool inProtected = true;
+    DataMemberList dataMembers = p->dataMembers();
+    bool prot = p->hasMetaData("protected");
+    for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+    {
+        if(prot || (*q)->hasMetaData("protected"))
+        {
+            if(!inProtected)
+            {
+                H.dec();
+                H << sp << nl << "protected:";
+                H.inc();
+                inProtected = true;
+            }
+        }
+        else
+        {
+            if(inProtected)
+            {
+                H.dec();
+                H << sp << nl << "public:";
+                H.inc();
+                inProtected = false;
+            }
+        }
+
+        emitDataMember(*q);
+    }
+
+    if(!_doneStaticSymbol)
+    {
+        H << sp << nl << "friend class " << p->name() << "__staticInit;";
+    }
+
+    if(preserved && !basePreserved)
+    {
+        if(!inProtected)
+        {
+            H.dec();
+            H << sp << nl << "protected:";
+            H.inc();
+            inProtected = true;
+        }
+        H << sp << nl << "::Ice::SlicedDataPtr __slicedData;";
+    }
+
+    H << eb << ';';
+
+    if(!_doneStaticSymbol)
+    {
+        //
+        // We need an instance here to trigger initialization if the implementation is in a shared library.
+        // But we do this only once per source file, because a single instance is sufficient to initialize
+        // all of the globals in a shared library.
+        //
+        // For a Slice class Foo, we instantiate a dummy class Foo__staticInit instead of using a static
+        // Foo instance directly because Foo has a protected destructor.
+        //
+        H << sp << nl << "class " << p->name() << "__staticInit";
+        H << sb;
+        H.dec();
+        H << nl << "public:";
+        H.inc();
+        H << sp << nl << scoped << " _init;";
+        H << eb << ';';
+        _doneStaticSymbol = true;
+        H << sp << nl << "static " << p->name() << "__staticInit _" << p->name() << "_init;";
+    }
+
+    _useWstring = resetUseWstring(_useWstringHist);
+}
+
+bool
+Slice::Gen::Cpp11ValueVisitor::visitExceptionStart(const ExceptionPtr&)
+{
+    return false;
+}
+
+bool
+Slice::Gen::Cpp11ValueVisitor::visitStructStart(const StructPtr&)
+{
+    return false;
+}
+
+void
+Slice::Gen::Cpp11ValueVisitor::visitOperation(const OperationPtr&)
+{
+}
+
+
+bool
+Slice::Gen::Cpp11ObjectVisitor::emitVirtualBaseInitializers(const ClassDefPtr& p, bool virtualInheritance, bool direct)
+{
+    DataMemberList allDataMembers = p->allDataMembers();
+    if(allDataMembers.empty())
+    {
+        return false;
+    }
+
+    ClassList bases = p->bases();
+    if(!bases.empty() && !bases.front()->isInterface())
+    {
+        if(emitVirtualBaseInitializers(bases.front(), false, false))
+        {
+            H << ',';
+        }
+    }
+
+    //
+    // Do not call non direct base classes constructor if not using virtual inheritance.
+    //
+    if(!direct && !virtualInheritance)
+    {
+        return false;
+    }
+
+    string upcall = "(";
+    for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+    {
+        if(q != allDataMembers.begin())
+        {
+            upcall += ", ";
+        }
+        upcall += "__ice_" + (*q)->name();
+    }
+    upcall += ")";
+
+    H << nl << fixKwd(p->scoped()) << upcall;
+
+    return true;
+}
+
+void
+Slice::Gen::Cpp11ObjectVisitor::emitOneShotConstructor(const ClassDefPtr& p)
+{
+    DataMemberList allDataMembers = p->allDataMembers();
+
+    if(!allDataMembers.empty())
+    {
+        vector<string> allParamDecls;
+        DataMemberList dataMembers = p->dataMembers();
+
+        for(DataMemberList::const_iterator q = allDataMembers.begin(); q != allDataMembers.end(); ++q)
+        {
+            
+            string typeName = inputTypeToString((*q)->type(), (*q)->optional(), (*q)->getMetaData(), _useWstring);
+            allParamDecls.push_back(typeName + " __ice_" + (*q)->name());
+        }
+
+        H << sp << nl;
+        if(allParamDecls.size() == 1)
+        {
+            H << "explicit ";
+        }
+        H << fixKwd(p->name()) << spar << allParamDecls << epar << " :";
+        H.inc();
+
+        ClassList bases = p->bases();
+        ClassDefPtr base;
+        
+        if(!bases.empty() && !bases.front()->isInterface())
+        {
+            if(emitVirtualBaseInitializers(bases.front(), false, true))
+            {
+                if(!dataMembers.empty())
+                {
+                    H << ',';
+                }
+            }
+        }
+
+        if(!dataMembers.empty())
+        {
+            H << nl;
+        }
+        for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+        {
+            if(q != dataMembers.begin())
+            {
+                H << ',' << nl;
+            }
+            string memberName = fixKwd((*q)->name());
+            H << memberName << '(' << "__ice_" << (*q)->name() << ')';
+        }
+
+        H.dec();
+        H << sb;
+        H << eb;
+    }
+}
+
+Slice::Gen::Cpp11StreamVisitor::Cpp11StreamVisitor(Output& h, Output& c, const string& dllExport) :
+    H(h),
+    C(c),
+    _dllExport(dllExport)
+{
+}
+
+bool
+Slice::Gen::Cpp11StreamVisitor::visitModuleStart(const ModulePtr& m)
+{
+    if(!m->hasNonLocalContained(Contained::ContainedTypeStruct) &&
+       !m->hasNonLocalContained(Contained::ContainedTypeEnum) &&
+       !m->hasNonLocalContained(Contained::ContainedTypeException))
+    {
+        return false;
+    }
+
+    if(UnitPtr::dynamicCast(m->container()))
+    {
+        //
+        // Only emit this for the top-level module.
+        //
+        H << sp;
+        H << nl << "namespace Ice" << nl << '{';
+
+        C << sp;
+        C << nl << "namespace Ice" << nl << '{';
+    }
+
+    return true;
+}
+
+void
+Slice::Gen::Cpp11StreamVisitor::visitModuleEnd(const ModulePtr& m)
+{
+    if(UnitPtr::dynamicCast(m->container()))
+    {
+        //
+        // Only emit this for the top-level module.
+        //
+        H << nl << '}';
+        C << nl << '}';
+    }
+}
+
+bool
+Slice::Gen::Cpp11StreamVisitor::visitExceptionStart(const ExceptionPtr&)
+{
+    return false;
+}
+
+bool
+Slice::Gen::Cpp11StreamVisitor::visitStructStart(const StructPtr& p)
+{
+    if(!p->isLocal())
+    {
+        string scoped = fixKwd(p->scoped());
+
+        H << nl << "template<>";
+
+        H << nl << "struct StreamableTraits< " << scoped << ">";
+
+        H << sb;
+        H << nl << "static const StreamHelperCategory helper = StreamHelperCategoryStruct;";
+
+        H << nl << "static const int minWireSize = " << p->minWireSize() << ";";
+        if(p->isVariableLength())
+        {
+            H << nl << "static const bool fixedLength = false;";
+        }
+        else
+        {
+            H << nl << "static const bool fixedLength = true;";
+        }
+        H << eb << ";" << nl;
+
+        DataMemberList dataMembers = p->dataMembers();
+
+        H << nl << "template<class S>";
+        H << nl << "struct StreamWriter< " << scoped << ", S>";
+        H << sb;
+        H << nl << "static void write(S* __os, const " <<  scoped << "& v)";
+        H << sb;
+        for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+        {
+            writeMarshalUnmarshalDataMemberInHolder(H, "v.", *q, true);
+        }
+        H << eb;
+        H << eb << ";" << nl;
+
+        H << nl << "template<class S>";
+        H << nl << "struct StreamReader< " << scoped << ", S>";
+        H << sb;
+        H << nl << "static void read(S* __is, " << scoped << "& v)";
+        H << sb;
+        for(DataMemberList::const_iterator q = dataMembers.begin(); q != dataMembers.end(); ++q)
+        {
+            writeMarshalUnmarshalDataMemberInHolder(H, "v.", *q, false);
+        }
+        H << eb;
+        H << eb << ";" << nl;
+
+        if(!_dllExport.empty())
+        {
+            //
+            // We tell "importers" that the implementation exports these instantiations
+            //
+            H << nl << "#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(";
+            H << _dllExport.substr(0, _dllExport.size() - 1) + "_EXPORTS) && !defined(ICE_STATIC_LIBS)";
+            H << nl << "template struct " << _dllExport << "StreamWriter< " << scoped << ", ::IceInternal::BasicStream>;";
+            H << nl << "template struct " << _dllExport << "StreamReader< " << scoped << ", ::IceInternal::BasicStream>;";
+            H << nl << "#endif" << nl;
+
+            //
+            // The instantations:
+            //
+            C << nl << "#if defined(ICE_HAS_DECLSPEC_IMPORT_EXPORT) && !defined(ICE_STATIC_LIBS)";
+            C << nl << "template struct " << _dllExport << "StreamWriter< " << scoped << ", ::IceInternal::BasicStream>;";
+            C << nl << "template struct " << _dllExport << "StreamReader< " << scoped << ", ::IceInternal::BasicStream>;";
+            C << nl << "#endif";
+        }
+    }
+    return false;
+}
+
+void
+Slice::Gen::Cpp11StreamVisitor::visitEnum(const EnumPtr& p)
+{
+    if(!p->isLocal())
+    {
+        string scoped = fixKwd(p->scoped());
+        H << nl << "template<>";
+        H << nl << "struct StreamableTraits< " << scoped << ">";
+        H << sb;
+        H << nl << "static const StreamHelperCategory helper = StreamHelperCategoryEnum;";
+        H << nl << "static const int minValue = " << p->minValue() << ";";
+        H << nl << "static const int maxValue = " << p->maxValue() << ";";
+        H << nl << "static const int minWireSize = " << p->minWireSize() << ";";
+        H << nl << "static const bool fixedLength = false;";
+        H << eb << ";" << nl;
+    }
+}
+
+Slice::Gen::Cpp11InterfaceTraitsVisitor::Cpp11InterfaceTraitsVisitor(Output& h, Output& c, const string& dllExport) :
+    H(h), C(c), _dllExport(dllExport)
+{
+}
+
+bool
+Slice::Gen::Cpp11InterfaceTraitsVisitor::visitUnitStart(const UnitPtr& p)
+{
+    if(!p->hasNonLocalClassDecls())
+    {
+        return false;
+    }
+
+    H << sp << nl << "namespace Ice" << nl << '{';
+
+    return true;
+}
+
+void
+Slice::Gen::Cpp11InterfaceTraitsVisitor::visitUnitEnd(const UnitPtr&)
+{
+    H << sp << nl << '}';
+}
+
+bool
+Slice::Gen::Cpp11InterfaceTraitsVisitor::visitClassDefStart(const ClassDefPtr& p)
+{
+    if(!p->isInterface() || p->isLocal())
+    {
+        return false;
+    }
+    H << sp;
+    H << nl << "template<>";
+    H << nl << "struct InterfaceTraits<" << fixKwd(p->scoped()) << ">";
+    H << sb;
+    H << nl << "static const std::string staticId;";
+    H << nl << "static const int compactId = " << p->compactId() << ";";
+    H << eb << ";";
+    
+    C << sp;
+    C << nl << "const std::string Ice::InterfaceTraits<" << fixKwd(p->scoped()) << ">::staticId = \"" << p->scoped() << "\";"; 
+    return true;
+}
diff --git a/cpp/src/slice2cpp/Gen.h b/cpp/src/slice2cpp/Gen.h
index ea122709a6e..1877ff01d88 100644
--- a/cpp/src/slice2cpp/Gen.h
+++ b/cpp/src/slice2cpp/Gen.h
@@ -36,7 +36,7 @@ public:
 
     void generate(const UnitPtr&);
     void closeOutput();
-    
+
     static int setUseWstring(ContainedPtr, std::list<int>&, int);
     static int resetUseWstring(std::list<int>&);
 
@@ -321,7 +321,7 @@ private:
         int _useWstring;
         std::list<int> _useWstringHist;
     };
-    
+
     class StreamVisitor : private ::IceUtil::noncopyable, public ParserVisitor
     {
     public:
@@ -340,6 +340,253 @@ private:
         ::IceUtilInternal::Output& C;
         std::string _dllExport;
     };
+    //
+    // C++11 Visitors
+    //
+    class Cpp11ObjectDeclVisitor : private ::IceUtil::noncopyable, public ParserVisitor
+    {
+    public:
+
+        Cpp11ObjectDeclVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual void visitClassDecl(const ClassDeclPtr&);
+        virtual void visitOperation(const OperationPtr&);
+
+    private:
+
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
+
+        std::string _dllExport;
+    };
+
+    class Cpp11TypesVisitor : private ::IceUtil::noncopyable, public ParserVisitor
+    {
+    public:
+
+        Cpp11TypesVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual void visitExceptionEnd(const ExceptionPtr&);
+        virtual bool visitStructStart(const StructPtr&);
+        virtual void visitStructEnd(const StructPtr&);
+        virtual void visitSequence(const SequencePtr&);
+        virtual void visitDictionary(const DictionaryPtr&);
+        virtual void visitEnum(const EnumPtr&);
+        virtual void visitConst(const ConstPtr&);
+        virtual void visitDataMember(const DataMemberPtr&);
+
+    private:
+
+        void emitUpcall(const ExceptionPtr&, const std::string&, bool = false);
+
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
+
+        std::string _dllExport;
+        bool _stream;
+        bool _doneStaticSymbol;
+        int _useWstring;
+        std::list<int> _useWstringHist;
+    };
+
+    class Cpp11ProxyVisitor : private ::IceUtil::noncopyable, public ParserVisitor
+    {
+    public:
+
+        Cpp11ProxyVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+        virtual bool visitUnitStart(const UnitPtr&);
+        virtual void visitUnitEnd(const UnitPtr&);
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual void visitClassDefEnd(const ClassDefPtr&);
+        virtual void visitOperation(const OperationPtr&);
+
+    private:
+
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
+
+        std::string _dllExport;
+        int _useWstring;
+        std::list<int> _useWstringHist;
+    };
+
+    class Cpp11ProxyDeclVisitor : private ::IceUtil::noncopyable, public ParserVisitor
+    {
+    public:
+
+        Cpp11ProxyDeclVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+        virtual bool visitUnitStart(const UnitPtr&);
+        virtual void visitUnitEnd(const UnitPtr&);
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual void visitClassDecl(const ClassDeclPtr&);
+
+    private:
+
+        ::IceUtilInternal::Output& H;
+
+        std::string _dllExport;
+    };
+    
+    class Cpp11ObjectVisitor : public ParserVisitor
+    {
+    public:
+
+        Cpp11ObjectVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool);
+
+    protected:
+
+        bool emitVirtualBaseInitializers(const ClassDefPtr&, bool, bool);
+        void emitOneShotConstructor(const ClassDefPtr&);
+        void emitDataMember(const DataMemberPtr&);
+
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
+
+        std::string _dllExport;
+        bool _stream;
+        bool _doneStaticSymbol;
+        int _useWstring;
+        std::list<int> _useWstringHist;
+    };
+    
+    class Cpp11LocalObjectVisitor : private ::IceUtil::noncopyable, public Cpp11ObjectVisitor
+    {
+    public:
+
+        Cpp11LocalObjectVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual void visitClassDefEnd(const ClassDefPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual bool visitStructStart(const StructPtr&);
+        virtual void visitOperation(const OperationPtr&);
+    };
+    
+    class Cpp11InterfaceVisitor : private ::IceUtil::noncopyable, public Cpp11ObjectVisitor
+    {
+    public:
+
+        Cpp11InterfaceVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual void visitClassDefEnd(const ClassDefPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual bool visitStructStart(const StructPtr&);
+        virtual void visitOperation(const OperationPtr&);
+        void emitUpcall(const ClassDefPtr&, const std::string&);
+    };
+    
+    class Cpp11ValueVisitor : private ::IceUtil::noncopyable, public Cpp11ObjectVisitor
+    {
+    public:
+
+        Cpp11ValueVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&, bool);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual void visitClassDefEnd(const ClassDefPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual bool visitStructStart(const StructPtr&);
+        virtual void visitOperation(const OperationPtr&);
+        void emitUpcall(const ClassDefPtr&, const std::string&);
+    };
+
+    class Cpp11AsyncVisitor : private ::IceUtil::noncopyable, public ParserVisitor
+    {
+    public:
+
+        Cpp11AsyncVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual void visitClassDefEnd(const ClassDefPtr&);
+        virtual void visitOperation(const OperationPtr&);
+
+    private:
+
+        ::IceUtilInternal::Output& H;
+
+        std::string _dllExport;
+        int _useWstring;
+        std::list<int> _useWstringHist;
+    };
+    
+    class Cpp11AsyncImplVisitor : private ::IceUtil::noncopyable, public ParserVisitor
+    {
+    public:
+
+        Cpp11AsyncImplVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+        virtual bool visitUnitStart(const UnitPtr&);
+        virtual void visitUnitEnd(const UnitPtr&);
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+        virtual void visitClassDefEnd(const ClassDefPtr&);
+        virtual void visitOperation(const OperationPtr&);
+
+    private:
+
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
+
+        std::string _dllExport;
+        int _useWstring;
+        std::list<int> _useWstringHist;
+    };
+
+    class Cpp11StreamVisitor : private ::IceUtil::noncopyable, public ParserVisitor
+    {
+    public:
+
+        Cpp11StreamVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+        virtual bool visitModuleStart(const ModulePtr&);
+        virtual void visitModuleEnd(const ModulePtr&);
+        virtual bool visitStructStart(const StructPtr&);
+        virtual bool visitExceptionStart(const ExceptionPtr&);
+        virtual void visitEnum(const EnumPtr&);
+
+    private:
+
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
+        std::string _dllExport;
+    };
+    
+    class Cpp11InterfaceTraitsVisitor : private ::IceUtil::noncopyable, public ParserVisitor
+    {
+    public:
+
+        Cpp11InterfaceTraitsVisitor(::IceUtilInternal::Output&, ::IceUtilInternal::Output&, const std::string&);
+
+        virtual bool visitUnitStart(const UnitPtr&);
+        virtual void visitUnitEnd(const UnitPtr&);
+        virtual bool visitClassDefStart(const ClassDefPtr&);
+
+    private:
+
+        ::IceUtilInternal::Output& H;
+        ::IceUtilInternal::Output& C;
+        std::string _dllExport;
+    };
 
 private:
 
diff --git a/cpp/src/slice2cs/Gen.cpp b/cpp/src/slice2cs/Gen.cpp
index 2f901505901..12f86b183a0 100644
--- a/cpp/src/slice2cs/Gen.cpp
+++ b/cpp/src/slice2cs/Gen.cpp
@@ -365,6 +365,7 @@ Slice::CsVisitor::writeStreamMarshalDataMember(const DataMemberPtr& member, cons
             case Builtin::KindString:
             case Builtin::KindObject:
             case Builtin::KindObjectProxy:
+            case Builtin::KindValue:
             {
                 _out << nl << "int pos__ = outS__.startSize();";
                 writeMarshalUnmarshalCode(_out, member->type(), value, true, true);
diff --git a/cpp/src/slice2java/Gen.cpp b/cpp/src/slice2java/Gen.cpp
index e2c8474b2c1..e5876b07211 100644
--- a/cpp/src/slice2java/Gen.cpp
+++ b/cpp/src/slice2java/Gen.cpp
@@ -124,6 +124,7 @@ initValue(const TypePtr& p)
         case Builtin::KindObject:
         case Builtin::KindObjectProxy:
         case Builtin::KindLocalObject:
+        case Builtin::KindValue:
         {
             return "null";
         }
@@ -1938,6 +1939,7 @@ Slice::JavaVisitor::writeConstantValue(Output& out, const TypePtr& type, const S
                 case Builtin::KindObject:
                 case Builtin::KindObjectProxy:
                 case Builtin::KindLocalObject:
+                case Builtin::KindValue:
                 {
                     out << value;
                     break;
@@ -3979,6 +3981,7 @@ Slice::Gen::TypesVisitor::visitStructEnd(const StructPtr& p)
                 case Builtin::KindObject:
                 case Builtin::KindObjectProxy:
                 case Builtin::KindLocalObject:
+                case Builtin::KindValue:
                 {
                     out << nl << "if(" << memberName << " != _r." << memberName << ')';
                     out << sb;
@@ -6319,6 +6322,7 @@ Slice::Gen::BaseImplVisitor::writeDecl(Output& out, const string& package, const
                 case Builtin::KindObject:
                 case Builtin::KindObjectProxy:
                 case Builtin::KindLocalObject:
+                case Builtin::KindValue:
                 {
                     out << " = null";
                     break;
@@ -6392,6 +6396,7 @@ Slice::Gen::BaseImplVisitor::writeReturn(Output& out, const TypePtr& type, bool
                 case Builtin::KindObject:
                 case Builtin::KindObjectProxy:
                 case Builtin::KindLocalObject:
+                case Builtin::KindValue:
                 {
                     out << nl << "return null;";
                     break;
diff --git a/cpp/src/slice2js/JsUtil.cpp b/cpp/src/slice2js/JsUtil.cpp
index 7cc017bc16d..65c57c30623 100644
--- a/cpp/src/slice2js/JsUtil.cpp
+++ b/cpp/src/slice2js/JsUtil.cpp
@@ -192,6 +192,7 @@ Slice::JsGenerator::getOptionalFormat(const TypePtr& type)
             return "Ice.OptionalFormat.VSize";
         }
         case Builtin::KindObject:
+        case Builtin::KindValue:
         {
             return "Ice.OptionalFormat.Class";
         }
@@ -503,6 +504,7 @@ Slice::JsGenerator::writeMarshalUnmarshalCode(Output &out,
                 return;
             }
             case Builtin::KindObject:
+            case Builtin::KindValue:
             {
                 // Handle by isClassType below.
                 break;
@@ -670,6 +672,7 @@ Slice::JsGenerator::getHelper(const TypePtr& type)
                 return "Ice.StringHelper";
             }
             case Builtin::KindObject:
+            case Builtin::KindValue:
             {
                 return "Ice.ObjectHelper";
             }
diff --git a/cpp/src/slice2php/Main.cpp b/cpp/src/slice2php/Main.cpp
index 82a3dc40635..88a37ef619a 100644
--- a/cpp/src/slice2php/Main.cpp
+++ b/cpp/src/slice2php/Main.cpp
@@ -905,6 +905,7 @@ CodeVisitor::visitDictionary(const DictionaryPtr& p)
         case Slice::Builtin::KindObject:
         case Slice::Builtin::KindObjectProxy:
         case Slice::Builtin::KindLocalObject:
+        case Slice::Builtin::KindValue:
             assert(false);
         }
     }
@@ -1098,6 +1099,7 @@ CodeVisitor::writeType(const TypePtr& p)
                 break;
             }
             case Builtin::KindObject:
+            case Builtin::KindValue:
             {
                 _out << "$Ice__t_Object";
                 break;
@@ -1164,6 +1166,7 @@ CodeVisitor::writeDefaultValue(const DataMemberPtr& m)
             case Builtin::KindObject:
             case Builtin::KindObjectProxy:
             case Builtin::KindLocalObject:
+            case Builtin::KindValue:
             {
                 _out << "null";
                 break;
@@ -1342,6 +1345,7 @@ CodeVisitor::writeConstantValue(const TypePtr& type, const SyntaxTreeBasePtr& va
             case Slice::Builtin::KindObject:
             case Slice::Builtin::KindObjectProxy:
             case Slice::Builtin::KindLocalObject:
+            case Slice::Builtin::KindValue:
                 assert(false);
             }
         }
diff --git a/cpp/test/Glacier2/attack/.depend.mak b/cpp/test/Glacier2/attack/.depend.mak
index 25a7a30ba59..ebc4d3c46e8 100755
--- a/cpp/test/Glacier2/attack/.depend.mak
+++ b/cpp/test/Glacier2/attack/.depend.mak
@@ -16,6 +16,7 @@ Backend.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Backend.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Backend.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Backend.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ BackendI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ BackendI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ BackendI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ BackendI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ BackendI.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ BackendI.obj: \
     "$(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" \
@@ -222,6 +225,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -230,6 +234,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -270,7 +275,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -284,6 +289,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -295,7 +301,6 @@ Client.obj: \
     "$(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" \
@@ -317,7 +322,6 @@ Client.obj: \
     "$(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" \
@@ -355,6 +359,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -363,6 +368,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -403,7 +409,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -417,6 +423,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -428,7 +435,6 @@ Server.obj: \
     "$(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" \
@@ -450,7 +456,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Glacier2/dynamicFiltering/.depend.mak b/cpp/test/Glacier2/dynamicFiltering/.depend.mak
index 24c200acff3..53161996b25 100755
--- a/cpp/test/Glacier2/dynamicFiltering/.depend.mak
+++ b/cpp/test/Glacier2/dynamicFiltering/.depend.mak
@@ -20,6 +20,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -28,6 +29,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -62,7 +64,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -71,13 +73,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
@@ -107,6 +109,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -115,6 +118,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -155,7 +159,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -169,6 +173,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -180,7 +185,6 @@ Client.obj: \
     "$(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" \
@@ -202,7 +206,6 @@ Client.obj: \
     "$(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" \
@@ -240,6 +243,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -248,6 +252,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -288,7 +293,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -302,6 +307,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -313,7 +319,6 @@ Server.obj: \
     "$(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" \
@@ -335,7 +340,6 @@ Server.obj: \
     "$(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" \
@@ -369,6 +373,7 @@ SessionI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -377,6 +382,7 @@ SessionI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -417,7 +423,7 @@ SessionI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -431,6 +437,7 @@ SessionI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -442,7 +449,6 @@ SessionI.obj: \
     "$(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" \
@@ -465,7 +471,6 @@ SessionI.obj: \
     "$(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" \
@@ -497,6 +502,7 @@ BackendI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -505,6 +511,7 @@ BackendI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -545,7 +552,7 @@ BackendI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -559,6 +566,7 @@ BackendI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -570,7 +578,6 @@ BackendI.obj: \
     "$(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" \
@@ -593,7 +600,6 @@ BackendI.obj: \
     "$(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" \
@@ -624,6 +630,7 @@ TestControllerI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -632,6 +639,7 @@ TestControllerI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -672,7 +680,7 @@ TestControllerI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -686,6 +694,7 @@ TestControllerI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -697,7 +706,6 @@ TestControllerI.obj: \
     "$(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" \
@@ -720,7 +728,6 @@ TestControllerI.obj: \
     "$(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" \
diff --git a/cpp/test/Glacier2/override/.depend.mak b/cpp/test/Glacier2/override/.depend.mak
index c7120ea0b7c..e66df4dca6b 100755
--- a/cpp/test/Glacier2/override/.depend.mak
+++ b/cpp/test/Glacier2/override/.depend.mak
@@ -17,6 +17,7 @@ Callback.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -25,6 +26,7 @@ Callback.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -59,7 +61,7 @@ Callback.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -68,6 +70,7 @@ Callback.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -75,7 +78,6 @@ Callback.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -98,6 +100,7 @@ CallbackI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -106,6 +109,7 @@ CallbackI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -146,7 +150,7 @@ CallbackI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -160,6 +164,7 @@ CallbackI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -171,7 +176,6 @@ CallbackI.obj: \
     "$(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" \
@@ -194,7 +198,6 @@ CallbackI.obj: \
     "$(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" \
@@ -247,6 +250,7 @@ Client.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -254,6 +258,7 @@ Client.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -282,7 +287,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -295,6 +300,7 @@ Client.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -306,7 +312,6 @@ Client.obj: \
     "$(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" \
@@ -327,7 +332,6 @@ Client.obj: \
     "$(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" \
@@ -362,6 +366,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -370,6 +375,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -410,7 +416,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -424,6 +430,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -435,7 +442,6 @@ Server.obj: \
     "$(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" \
@@ -457,7 +463,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Glacier2/router/.depend.mak b/cpp/test/Glacier2/router/.depend.mak
index aaf929f4593..f5e29c58a32 100755
--- a/cpp/test/Glacier2/router/.depend.mak
+++ b/cpp/test/Glacier2/router/.depend.mak
@@ -17,6 +17,7 @@ Callback.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -25,6 +26,7 @@ Callback.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -59,7 +61,7 @@ Callback.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -68,6 +70,7 @@ Callback.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -75,7 +78,6 @@ Callback.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -100,6 +102,7 @@ CallbackI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -108,6 +111,7 @@ CallbackI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -148,7 +152,7 @@ CallbackI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -162,6 +166,7 @@ CallbackI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -173,7 +178,6 @@ CallbackI.obj: \
     "$(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" \
@@ -196,7 +200,6 @@ CallbackI.obj: \
     "$(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" \
@@ -250,6 +253,7 @@ Client.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -257,6 +261,7 @@ Client.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -285,7 +290,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -298,6 +303,7 @@ Client.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -309,7 +315,6 @@ Client.obj: \
     "$(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" \
@@ -330,7 +335,6 @@ Client.obj: \
     "$(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" \
@@ -365,6 +369,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -373,6 +378,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -413,7 +419,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -427,6 +433,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -438,7 +445,6 @@ Server.obj: \
     "$(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" \
@@ -460,7 +466,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Glacier2/sessionControl/.depend.mak b/cpp/test/Glacier2/sessionControl/.depend.mak
index 5d29af9b3a0..7382a43a3ac 100755
--- a/cpp/test/Glacier2/sessionControl/.depend.mak
+++ b/cpp/test/Glacier2/sessionControl/.depend.mak
@@ -20,6 +20,7 @@ Session.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -28,6 +29,7 @@ Session.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -62,7 +64,7 @@ Session.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -71,6 +73,7 @@ Session.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -78,7 +81,6 @@ Session.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Glacier2\Session.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
@@ -108,6 +110,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -116,6 +119,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -156,7 +160,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -170,6 +174,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -181,7 +186,6 @@ Client.obj: \
     "$(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" \
@@ -203,7 +207,6 @@ Client.obj: \
     "$(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" \
@@ -241,6 +244,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -249,6 +253,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -289,7 +294,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -303,6 +308,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -314,7 +320,6 @@ Server.obj: \
     "$(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" \
@@ -336,7 +341,6 @@ Server.obj: \
     "$(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" \
@@ -368,6 +372,7 @@ SessionI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -376,6 +381,7 @@ SessionI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -416,7 +422,7 @@ SessionI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -430,6 +436,7 @@ SessionI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -441,7 +448,6 @@ SessionI.obj: \
     "$(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" \
@@ -464,7 +470,6 @@ SessionI.obj: \
     "$(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" \
diff --git a/cpp/test/Glacier2/sessionHelper/.depend.mak b/cpp/test/Glacier2/sessionHelper/.depend.mak
index 94f0e71b2d8..1921a676ccb 100755
--- a/cpp/test/Glacier2/sessionHelper/.depend.mak
+++ b/cpp/test/Glacier2/sessionHelper/.depend.mak
@@ -16,6 +16,7 @@ Callback.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Callback.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Callback.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Callback.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -117,6 +119,7 @@ Client.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -124,6 +127,7 @@ Client.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -152,7 +156,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -165,6 +169,7 @@ Client.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -176,7 +181,6 @@ Client.obj: \
     "$(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" \
@@ -198,7 +202,6 @@ Client.obj: \
     "$(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" \
@@ -254,6 +257,7 @@ Server.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -261,6 +265,7 @@ Server.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -289,7 +294,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -302,6 +307,7 @@ Server.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -313,7 +319,6 @@ Server.obj: \
     "$(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" \
@@ -335,7 +340,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Glacier2/ssl/.depend.mak b/cpp/test/Glacier2/ssl/.depend.mak
index a3d5d447710..dfeefed13d3 100755
--- a/cpp/test/Glacier2/ssl/.depend.mak
+++ b/cpp/test/Glacier2/ssl/.depend.mak
@@ -16,6 +16,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -64,7 +66,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -78,6 +80,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -89,7 +92,6 @@ Client.obj: \
     "$(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" \
@@ -111,7 +113,6 @@ Client.obj: \
     "$(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" \
@@ -148,6 +149,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -156,6 +158,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -196,7 +199,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -210,6 +213,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -221,7 +225,6 @@ Server.obj: \
     "$(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" \
@@ -243,7 +246,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Glacier2/staticFiltering/.depend.mak b/cpp/test/Glacier2/staticFiltering/.depend.mak
index 0c59777e763..8d5a4b1f045 100755
--- a/cpp/test/Glacier2/staticFiltering/.depend.mak
+++ b/cpp/test/Glacier2/staticFiltering/.depend.mak
@@ -16,6 +16,7 @@ Backend.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Backend.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Backend.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Backend.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ BackendI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ BackendI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ BackendI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ BackendI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ BackendI.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ BackendI.obj: \
     "$(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" \
@@ -221,6 +224,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -229,6 +233,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -269,7 +274,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -283,6 +288,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -294,7 +300,6 @@ Client.obj: \
     "$(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" \
@@ -316,7 +321,6 @@ Client.obj: \
     "$(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" \
@@ -354,6 +358,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -362,6 +367,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -402,7 +408,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -416,6 +422,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -427,7 +434,6 @@ Server.obj: \
     "$(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" \
@@ -449,7 +455,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/Makefile b/cpp/test/Ice/Makefile
index 3735e180ff7..5115508c288 100644
--- a/cpp/test/Ice/Makefile
+++ b/cpp/test/Ice/Makefile
@@ -11,6 +11,18 @@ top_srcdir	= ../..
 
 include $(top_srcdir)/config/Make.rules
 
+ifeq ($(CPP11_MAPPING),yes)
+SUBDIRS		= proxy \
+                  operations \
+                  exceptions \
+                  ami \
+                  info \
+                  inheritance \
+                  objects \
+                  properties \
+                  admin \
+                  enums
+else
 SUBDIRS		= proxy \
                   operations \
                   exceptions \
@@ -52,7 +64,8 @@ SUBDIRS		= proxy \
                   echo \
                   logger \
                   networkProxy \
-		  services
+                  services
+endif
 
 .PHONY: $(EVERYTHING) $(SUBDIRS)
 
diff --git a/cpp/test/Ice/Makefile.mak b/cpp/test/Ice/Makefile.mak
index 06c131baeb9..407822dc35e 100644
--- a/cpp/test/Ice/Makefile.mak
+++ b/cpp/test/Ice/Makefile.mak
@@ -11,6 +11,18 @@ top_srcdir	= ..\..
 
 !include $(top_srcdir)\config\Make.rules.mak
 
+!if "$(CPP11_MAPPING)" == "yes"
+SUBDIRS		= proxy \
+                  operations \
+                  exceptions \
+                  ami \
+                  info \
+                  inheritance \
+                  objects \
+                  properties \
+                  admin \
+                  enums
+!else
 SUBDIRS		= proxy \
 		  operations \
 		  exceptions \
@@ -65,7 +77,7 @@ SUBDIRS		= $(SUBDIRS) \
 		  interceptor \
 		  services
 !endif
-
+!endif
 
 $(EVERYTHING)::
 	@for %i in ( $(SUBDIRS) ) do \
diff --git a/cpp/test/Ice/acm/.depend.mak b/cpp/test/Ice/acm/.depend.mak
index 80524069778..fc201e5e491 100755
--- a/cpp/test/Ice/acm/.depend.mak
+++ b/cpp/test/Ice/acm/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -224,6 +227,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -232,6 +236,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -272,7 +277,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -286,6 +291,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -297,7 +303,6 @@ AllTests.obj: \
     "$(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" \
@@ -320,7 +325,6 @@ AllTests.obj: \
     "$(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" \
@@ -371,6 +375,7 @@ TestI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -378,6 +383,7 @@ TestI.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -406,7 +412,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -419,6 +425,7 @@ TestI.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -430,7 +437,6 @@ TestI.obj: \
     "$(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" \
@@ -452,7 +458,6 @@ TestI.obj: \
     "$(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" \
@@ -480,6 +485,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -488,6 +494,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -528,7 +535,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -542,6 +549,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -553,7 +561,6 @@ Server.obj: \
     "$(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" \
@@ -576,7 +583,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/acm/AllTests.cpp b/cpp/test/Ice/acm/AllTests.cpp
index e1855fea2d4..d89c6827296 100644
--- a/cpp/test/Ice/acm/AllTests.cpp
+++ b/cpp/test/Ice/acm/AllTests.cpp
@@ -24,7 +24,9 @@ toString(int value)
     return os.str();
 }
 
-class LoggerI : public Ice::Logger, private IceUtil::Mutex
+class LoggerI : public ICE_ENABLE_SHARED_FROM_THIS(LoggerI),
+                public Ice::Logger, 
+                private IceUtil::Mutex
 {
 public:
 
@@ -93,7 +95,7 @@ public:
     virtual Ice::LoggerPtr
     cloneWithPrefix(const std::string&)
     {
-        return this;
+        return ICE_SHARED_FROM_THIS;
     }
 
 private:
@@ -111,13 +113,20 @@ private:
     bool _started;
     vector<string> _messages;
 };
-typedef IceUtil::Handle<LoggerI> LoggerIPtr;
-
-class TestCase : public IceUtil::Thread, protected Ice::ConnectionCallback, protected IceUtil::Monitor<IceUtil::Mutex>
+ICE_DEFINE_PTR(LoggerIPtr, LoggerI);
+
+class TestCase : 
+#ifdef ICE_CPP11_MAPPING
+                 public enable_shared_from_this<Ice::ConnectionCallback>,
+#else
+                 public IceUtil::Thread,
+#endif
+                 public Ice::ConnectionCallback,
+                 protected IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
 
-    TestCase(const string& name, const RemoteCommunicatorPrx& com) :
+    TestCase(const string& name, const RemoteCommunicatorPrxPtr& com) :
         _name(name), _com(com), _logger(new LoggerI()),
         _clientACMTimeout(-1), _clientACMClose(-1), _clientACMHeartbeat(-1),
         _serverACMTimeout(-1), _serverACMClose(-1), _serverACMHeartbeat(-1),
@@ -158,12 +167,19 @@ public:
         _communicator->destroy();
     }
 
-    void
-    join()
+#ifdef ICE_CPP11_MAPPING
+    void join(thread& t)
+#else
+    void join()
+#endif
     {
         cout << "testing " << _name << "... " << flush;
         _logger->start();
+#ifdef ICE_CPP11_MAPPING
+        t.join();
+#else
         getThreadControl().join();
+#endif
         if(_msg.empty())
         {
             cout << "ok" << endl;
@@ -178,11 +194,11 @@ public:
     virtual void
     run()
     {
-        TestIntfPrx proxy = TestIntfPrx::uncheckedCast(_communicator->stringToProxy(
+        TestIntfPrxPtr proxy = ICE_UNCHECKED_CAST(TestIntfPrx, _communicator->stringToProxy(
                                                            _adapter->getTestIntf()->ice_toString()));
         try
         {
-            proxy->ice_getConnection()->setCallback(this);
+            proxy->ice_getConnection()->setCallback(ICE_SHARED_FROM_THIS);
             runTestCase(_adapter, proxy);
         }
         catch(const std::exception& ex)
@@ -225,7 +241,7 @@ public:
         }
     }
 
-    virtual void runTestCase(const RemoteObjectAdapterPrx&, const TestIntfPrx&) = 0;
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr&, const TestIntfPrxPtr&) = 0;
 
     void
     setClientACM(int timeout, int close, int heartbeat)
@@ -246,12 +262,12 @@ public:
 protected:
 
     const string _name;
-    const RemoteCommunicatorPrx _com;
+    const RemoteCommunicatorPrxPtr _com;
     string _msg;
     LoggerIPtr _logger;
 
     Ice::CommunicatorPtr _communicator;
-    RemoteObjectAdapterPrx _adapter;
+    RemoteObjectAdapterPrxPtr _adapter;
 
     int _clientACMTimeout;
     int _clientACMClose;
@@ -263,306 +279,323 @@ protected:
     int _heartbeat;
     bool _closed;
 };
-typedef IceUtil::Handle<TestCase> TestCasePtr;
-
-}
+ICE_DEFINE_PTR(TestCasePtr, TestCase);
 
-void
-allTests(const Ice::CommunicatorPtr& communicator)
+class InvocationHeartbeatTest : public TestCase
 {
-    string ref = "communicator:default -p 12010";
-    RemoteCommunicatorPrx com = RemoteCommunicatorPrx::uncheckedCast(communicator->stringToProxy(ref));
-
-    vector<TestCasePtr> tests;
+public:
 
-    class InvocationHeartbeatTest : public TestCase
+    InvocationHeartbeatTest(const RemoteCommunicatorPrxPtr& com) :
+        TestCase("invocation heartbeat", com)
     {
-    public:
+    }
 
-        InvocationHeartbeatTest(const RemoteCommunicatorPrx& com) :
-            TestCase("invocation heartbeat", com)
-        {
-        }
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    {
+        proxy->sleep(2);
 
-        virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy)
-        {
-            proxy->sleep(2);
+        Lock sync(*this);
+        test(_heartbeat >= 2);
+    }
+};
 
-            Lock sync(*this);
-            test(_heartbeat >= 2);
-        }
-    };
+class InvocationHeartbeatOnHoldTest : public TestCase
+{
+public:
 
-    class InvocationHeartbeatOnHoldTest : public TestCase
+    InvocationHeartbeatOnHoldTest(const RemoteCommunicatorPrxPtr& com) :
+        TestCase("invocation with heartbeat on hold", com)
     {
-    public:
+        // Use default ACM configuration.
+    }
 
-        InvocationHeartbeatOnHoldTest(const RemoteCommunicatorPrx& com) :
-            TestCase("invocation with heartbeat on hold", com)
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    {
+        try
         {
-            // Use default ACM configuration.
+            // When the OA is put on hold, connections shouldn't
+            // send heartbeats, the invocation should therefore
+            // fail.
+            proxy->sleepAndHold(10);
+            test(false);
         }
-
-        virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy)
+        catch(const Ice::ConnectionTimeoutException&)
         {
-            try
-            {
-                // When the OA is put on hold, connections shouldn't
-                // send heartbeats, the invocation should therefore
-                // fail.
-                proxy->sleepAndHold(10);
-                test(false);
-            }
-            catch(const Ice::ConnectionTimeoutException&)
-            {
-                adapter->activate();
-                proxy->interruptSleep();
+            adapter->activate();
+            proxy->interruptSleep();
 
-                waitForClosed();
-            }
+            waitForClosed();
         }
-    };
+    }
+};
+
+class InvocationNoHeartbeatTest : public TestCase
+{
+public:
 
-    class InvocationNoHeartbeatTest : public TestCase
+    InvocationNoHeartbeatTest(const RemoteCommunicatorPrxPtr& com) :
+        TestCase("invocation with no heartbeat", com)
     {
-    public:
+        setServerACM(1, 2, 0); // Disable heartbeat on invocations
+    }
 
-        InvocationNoHeartbeatTest(const RemoteCommunicatorPrx& com) :
-            TestCase("invocation with no heartbeat", com)
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    {
+        try
         {
-            setServerACM(1, 2, 0); // Disable heartbeat on invocations
+            // Heartbeats are disabled on the server, the
+            // invocation should fail since heartbeats are
+            // expected.
+            proxy->sleep(10);
+            test(false);
         }
-
-        virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy)
+        catch(const Ice::ConnectionTimeoutException&)
         {
-            try
-            {
-                // Heartbeats are disabled on the server, the
-                // invocation should fail since heartbeats are
-                // expected.
-                proxy->sleep(10);
-                test(false);
-            }
-            catch(const Ice::ConnectionTimeoutException&)
-            {
-                proxy->interruptSleep();
+            proxy->interruptSleep();
 
-                waitForClosed();
+            waitForClosed();
 
-                Lock sync(*this);
-                test(_heartbeat == 0);
-            }
+            Lock sync(*this);
+            test(_heartbeat == 0);
         }
-    };
+    }
+};
+
+class InvocationHeartbeatCloseOnIdleTest : public TestCase
+{
+public:
 
-    class InvocationHeartbeatCloseOnIdleTest : public TestCase
+    InvocationHeartbeatCloseOnIdleTest(const RemoteCommunicatorPrxPtr& com) :
+        TestCase("invocation with no heartbeat and close on idle", com)
     {
-    public:
+        setClientACM(1, 1, 0); // Only close on idle.
+        setServerACM(1, 2, 0); // Disable heartbeat on invocations
+    }
 
-        InvocationHeartbeatCloseOnIdleTest(const RemoteCommunicatorPrx& com) :
-            TestCase("invocation with no heartbeat and close on idle", com)
-        {
-            setClientACM(1, 1, 0); // Only close on idle.
-            setServerACM(1, 2, 0); // Disable heartbeat on invocations
-        }
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    {
+        // No close on invocation, the call should succeed this
+        // time.
+        proxy->sleep(2);
 
-        virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy)
-        {
-            // No close on invocation, the call should succeed this
-            // time.
-            proxy->sleep(2);
+        Lock sync(*this);
+        test(_heartbeat == 0);
+        test(!_closed);
+    }
+};
 
-            Lock sync(*this);
-            test(_heartbeat == 0);
-            test(!_closed);
-        }
-    };
+class CloseOnIdleTest : public TestCase
+{
+public:
 
-    class CloseOnIdleTest : public TestCase
+    CloseOnIdleTest(const RemoteCommunicatorPrxPtr& com) : TestCase("close on idle", com)
     {
-    public:
+        setClientACM(1, 1, 0); // Only close on idle
+    }
 
-        CloseOnIdleTest(const RemoteCommunicatorPrx& com) : TestCase("close on idle", com)
-        {
-            setClientACM(1, 1, 0); // Only close on idle
-        }
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    {
+        IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1500)); // Idle for 1.5 seconds
 
-        virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy)
-        {
-            IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1500)); // Idle for 1.5 seconds
+        waitForClosed();
 
-            waitForClosed();
+        Lock sync(*this);
+        test(_heartbeat == 0);
+    }
+};
 
-            Lock sync(*this);
-            test(_heartbeat == 0);
-        }
-    };
+class CloseOnInvocationTest : public TestCase
+{
+public:
 
-    class CloseOnInvocationTest : public TestCase
+    CloseOnInvocationTest(const RemoteCommunicatorPrxPtr& com) : TestCase("close on invocation", com)
     {
-    public:
+        setClientACM(1, 2, 0); // Only close on invocation
+    }
 
-        CloseOnInvocationTest(const RemoteCommunicatorPrx& com) : TestCase("close on invocation", com)
-        {
-            setClientACM(1, 2, 0); // Only close on invocation
-        }
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    {
+        IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1500)); // Idle for 1.5 seconds
 
-        virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy)
-        {
-            IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1500)); // Idle for 1.5 seconds
+        Lock sync(*this);
+        test(_heartbeat == 0);
+        test(!_closed);
+    }
+};
 
-            Lock sync(*this);
-            test(_heartbeat == 0);
-            test(!_closed);
-        }
-    };
+class CloseOnIdleAndInvocationTest : public TestCase
+{
+public:
 
-    class CloseOnIdleAndInvocationTest : public TestCase
+    CloseOnIdleAndInvocationTest(const RemoteCommunicatorPrxPtr& com) : TestCase("close on idle and invocation", com)
     {
-    public:
+        setClientACM(1, 3, 0); // Only close on idle and invocation
+    }
 
-        CloseOnIdleAndInvocationTest(const RemoteCommunicatorPrx& com) : TestCase("close on idle and invocation", com)
-        {
-            setClientACM(1, 3, 0); // Only close on idle and invocation
-        }
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    {
+        //
+        // Put the adapter on hold. The server will not respond to
+        // the graceful close. This allows to test whether or not
+        // the close is graceful or forceful.
+        //
+        adapter->hold();
+        IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1500)); // Idle for 1.5 seconds
 
-        virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy)
         {
-            //
-            // Put the adapter on hold. The server will not respond to
-            // the graceful close. This allows to test whether or not
-            // the close is graceful or forceful.
-            //
-            adapter->hold();
-            IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1500)); // Idle for 1.5 seconds
+            Lock sync(*this);
+            test(_heartbeat == 0);
+            test(!_closed); // Not closed yet because of graceful close.
+        }
 
-            {
-                Lock sync(*this);
-                test(_heartbeat == 0);
-                test(!_closed); // Not closed yet because of graceful close.
-            }
+        adapter->activate();
+        IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(500));
 
-            adapter->activate();
-            IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(500));
+        waitForClosed();
+    }
+};
 
-            waitForClosed();
-        }
-    };
+class ForcefulCloseOnIdleAndInvocationTest : public TestCase
+{
+public:
 
-    class ForcefulCloseOnIdleAndInvocationTest : public TestCase
+    ForcefulCloseOnIdleAndInvocationTest(const RemoteCommunicatorPrxPtr& com) :
+        TestCase("forceful close on idle and invocation", com)
     {
-    public:
+        setClientACM(1, 4, 0); // Only close on idle and invocation
+    }
 
-        ForcefulCloseOnIdleAndInvocationTest(const RemoteCommunicatorPrx& com) :
-            TestCase("forceful close on idle and invocation", com)
-        {
-            setClientACM(1, 4, 0); // Only close on idle and invocation
-        }
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    {
+        adapter->hold();
+        IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1500)); // Idle for 1.5 seconds
 
-        virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy)
-        {
-            adapter->hold();
-            IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(1500)); // Idle for 1.5 seconds
+        waitForClosed();
 
-            waitForClosed();
+        Lock sync(*this);
+        test(_heartbeat == 0);
+    }
+};
 
-            Lock sync(*this);
-            test(_heartbeat == 0);
-        }
-    };
+class HeartbeatOnIdleTest : public TestCase
+{
+public:
 
-    class HeartbeatOnIdleTest : public TestCase
+    HeartbeatOnIdleTest(const RemoteCommunicatorPrxPtr& com) : TestCase("heartbeat on idle", com)
     {
-    public:
+        setServerACM(1, -1, 2); // Enable server heartbeats.
+    }
 
-        HeartbeatOnIdleTest(const RemoteCommunicatorPrx& com) : TestCase("heartbeat on idle", com)
-        {
-            setServerACM(1, -1, 2); // Enable server heartbeats.
-        }
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    {
+        IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(2000));
 
-        virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy)
-        {
-            IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(2000));
+        Lock sync(*this);
+        test(_heartbeat >= 3);
+    }
+};
 
-            Lock sync(*this);
-            test(_heartbeat >= 3);
-        }
-    };
+class HeartbeatAlwaysTest : public TestCase
+{
+public:
 
-    class HeartbeatAlwaysTest : public TestCase
+    HeartbeatAlwaysTest(const RemoteCommunicatorPrxPtr& com) : TestCase("heartbeat always", com)
     {
-    public:
+        setServerACM(1, -1, 3); // Enable server heartbeats.
+    }
 
-        HeartbeatAlwaysTest(const RemoteCommunicatorPrx& com) : TestCase("heartbeat always", com)
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    {
+        for(int i = 0; i < 12; ++i)
         {
-            setServerACM(1, -1, 3); // Enable server heartbeats.
+            proxy->ice_ping();
+            IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(200));
         }
 
-        virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy)
-        {
-            for(int i = 0; i < 12; ++i)
-            {
-                proxy->ice_ping();
-                IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(200));
-            }
+        Lock sync(*this);
+        test(_heartbeat >= 3);
+    }
+};
 
-            Lock sync(*this);
-            test(_heartbeat >= 3);
-        }
-    };
+class SetACMTest : public TestCase
+{
+public:
 
-    class SetACMTest : public TestCase
+    SetACMTest(const RemoteCommunicatorPrxPtr& com) : TestCase("setACM/getACM", com)
     {
-    public:
+        setClientACM(15, 4, 0);
+    }
 
-        SetACMTest(const RemoteCommunicatorPrx& com) : TestCase("setACM/getACM", com)
-        {
-            setClientACM(15, 4, 0);
-        }
+    virtual void runTestCase(const RemoteObjectAdapterPrxPtr& adapter, const TestIntfPrxPtr& proxy)
+    {
+        Ice::ACM acm;
+        acm = proxy->ice_getCachedConnection()->getACM();
+        test(acm.timeout == 15);
+        test(acm.close == Ice::CloseOnIdleForceful);
+        test(acm.heartbeat == Ice::HeartbeatOff);
 
-        virtual void runTestCase(const RemoteObjectAdapterPrx& adapter, const TestIntfPrx& proxy)
-        {
-            Ice::ACM acm;
-            acm = proxy->ice_getCachedConnection()->getACM();
-            test(acm.timeout == 15);
-            test(acm.close == Ice::CloseOnIdleForceful);
-            test(acm.heartbeat == Ice::HeartbeatOff);
-
-            proxy->ice_getCachedConnection()->setACM(IceUtil::None, IceUtil::None, IceUtil::None);
-            acm = proxy->ice_getCachedConnection()->getACM();
-            test(acm.timeout == 15);
-            test(acm.close == Ice::CloseOnIdleForceful);
-            test(acm.heartbeat == Ice::HeartbeatOff);
-
-            proxy->ice_getCachedConnection()->setACM(1, Ice::CloseOnInvocationAndIdle, Ice::HeartbeatAlways);
-            acm = proxy->ice_getCachedConnection()->getACM();
-            test(acm.timeout == 1);
-            test(acm.close == Ice::CloseOnInvocationAndIdle);
-            test(acm.heartbeat == Ice::HeartbeatAlways);
-
-            // Make sure the client sends few heartbeats to the server
-            proxy->waitForHeartbeat(2);
-        }
-    };
+        proxy->ice_getCachedConnection()->setACM(IceUtil::None, IceUtil::None, IceUtil::None);
+        acm = proxy->ice_getCachedConnection()->getACM();
+        test(acm.timeout == 15);
+        test(acm.close == Ice::CloseOnIdleForceful);
+        test(acm.heartbeat == Ice::HeartbeatOff);
 
-    tests.push_back(new InvocationHeartbeatTest(com));
-    tests.push_back(new InvocationHeartbeatOnHoldTest(com));
-    tests.push_back(new InvocationNoHeartbeatTest(com));
-    tests.push_back(new InvocationHeartbeatCloseOnIdleTest(com));
+        proxy->ice_getCachedConnection()->setACM(1, Ice::CloseOnInvocationAndIdle, Ice::HeartbeatAlways);
+        acm = proxy->ice_getCachedConnection()->getACM();
+        test(acm.timeout == 1);
+        test(acm.close == Ice::CloseOnInvocationAndIdle);
+        test(acm.heartbeat == Ice::HeartbeatAlways);
 
-    tests.push_back(new CloseOnIdleTest(com));
-    tests.push_back(new CloseOnInvocationTest(com));
-    tests.push_back(new CloseOnIdleAndInvocationTest(com));
-    tests.push_back(new ForcefulCloseOnIdleAndInvocationTest(com));
+        // Make sure the client sends few heartbeats to the server
+        proxy->waitForHeartbeat(2);
+    }
+};
 
-    tests.push_back(new HeartbeatOnIdleTest(com));
-    tests.push_back(new HeartbeatAlwaysTest(com));
-    tests.push_back(new SetACMTest(com));
+}
+
+void
+allTests(const Ice::CommunicatorPtr& communicator)
+{
+    string ref = "communicator:default -p 12010";
+    RemoteCommunicatorPrxPtr com = ICE_UNCHECKED_CAST(RemoteCommunicatorPrx, communicator->stringToProxy(ref));
+
+    vector<TestCasePtr> tests;
+
+    tests.push_back(ICE_MAKE_SHARED(InvocationHeartbeatTest, com));
+    tests.push_back(ICE_MAKE_SHARED(InvocationHeartbeatOnHoldTest, com));
+    tests.push_back(ICE_MAKE_SHARED(InvocationNoHeartbeatTest, com));
+    tests.push_back(ICE_MAKE_SHARED(InvocationHeartbeatCloseOnIdleTest, com));
+
+    tests.push_back(ICE_MAKE_SHARED(CloseOnIdleTest, com));
+    tests.push_back(ICE_MAKE_SHARED(CloseOnInvocationTest, com));
+    tests.push_back(ICE_MAKE_SHARED(CloseOnIdleAndInvocationTest, com));
+    tests.push_back(ICE_MAKE_SHARED(ForcefulCloseOnIdleAndInvocationTest, com));
+
+    tests.push_back(ICE_MAKE_SHARED(HeartbeatOnIdleTest, com));
+    tests.push_back(ICE_MAKE_SHARED(HeartbeatAlwaysTest, com));
+    tests.push_back(ICE_MAKE_SHARED(SetACMTest, com));
 
     for(vector<TestCasePtr>::const_iterator p = tests.begin(); p != tests.end(); ++p)
     {
         (*p)->init();
     }
+    
+#ifdef ICE_CPP11_MAPPING
+    vector<pair<thread, TestCasePtr>> threads;
+    for(auto p = tests.begin(); p != tests.end(); ++p)
+    {
+        TestCasePtr testCase = *p;
+        thread t([testCase]()
+            {
+                testCase->run();
+            });
+        threads.push_back(make_pair(move(t), testCase));
+    }
+    for(auto p = threads.begin(); p != threads.end(); ++p)
+    {
+        p->second->join(p->first);
+    }
+#else
     for(vector<TestCasePtr>::const_iterator p = tests.begin(); p != tests.end(); ++p)
     {
         (*p)->start();
@@ -571,6 +604,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     {
         (*p)->join();
     }
+#endif
     for(vector<TestCasePtr>::const_iterator p = tests.begin(); p != tests.end(); ++p)
     {
         (*p)->destroy();
diff --git a/cpp/test/Ice/acm/Server.cpp b/cpp/test/Ice/acm/Server.cpp
index a40af1f7b03..64abc193761 100644
--- a/cpp/test/Ice/acm/Server.cpp
+++ b/cpp/test/Ice/acm/Server.cpp
@@ -22,7 +22,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     communicator->getProperties()->setProperty("TestAdapter.ACM.Timeout", "0");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::Identity id = communicator->stringToIdentity("communicator");
-    adapter->add(new RemoteCommunicatorI(), id);
+    adapter->add(ICE_MAKE_SHARED(RemoteCommunicatorI), id);
     adapter->activate();
 
     TEST_READY
diff --git a/cpp/test/Ice/acm/TestI.cpp b/cpp/test/Ice/acm/TestI.cpp
index 493221b57a6..fb554bca5d1 100644
--- a/cpp/test/Ice/acm/TestI.cpp
+++ b/cpp/test/Ice/acm/TestI.cpp
@@ -26,7 +26,11 @@ toString(int value)
     return os.str();
 }
 
-class ConnectionCallbackI : public Ice::ConnectionCallback, private IceUtil::Monitor<IceUtil::Mutex>
+class ConnectionCallbackI : public Ice::ConnectionCallback,
+#ifdef ICE_CPP11_MAPPING
+                            public enable_shared_from_this<Ice::ConnectionCallback>,
+#endif
+                            private IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
 
@@ -58,11 +62,11 @@ private:
 
     int _count;
 };
-typedef IceUtil::Handle<ConnectionCallbackI> ConnectionCallbackIPtr;
+ICE_DEFINE_PTR(ConnectionCallbackIPtr, ConnectionCallbackI);
 
 }
 
-RemoteObjectAdapterPrx
+RemoteObjectAdapterPrxPtr
 RemoteCommunicatorI::createObjectAdapter(int timeout, int close, int heartbeat, const Current& current)
 {
     Ice::CommunicatorPtr com = current.adapter->getCommunicator();
@@ -85,7 +89,9 @@ RemoteCommunicatorI::createObjectAdapter(int timeout, int close, int heartbeat,
     }
     properties->setProperty(name + ".ThreadPool.Size", "2");
     ObjectAdapterPtr adapter = com->createObjectAdapterWithEndpoints(name, protocol + " -h \"" + host + "\"");
-    return RemoteObjectAdapterPrx::uncheckedCast(current.adapter->addWithUUID(new RemoteObjectAdapterI(adapter)));
+    
+    return ICE_UNCHECKED_CAST(RemoteObjectAdapterPrx, current.adapter->addWithUUID(
+                              ICE_MAKE_SHARED(RemoteObjectAdapterI, adapter)));
 }
 
 void
@@ -96,13 +102,13 @@ RemoteCommunicatorI::shutdown(const Ice::Current& current)
 
 RemoteObjectAdapterI::RemoteObjectAdapterI(const Ice::ObjectAdapterPtr& adapter) :
     _adapter(adapter),
-    _testIntf(TestIntfPrx::uncheckedCast(_adapter->add(new TestI(),
+    _testIntf(ICE_UNCHECKED_CAST(TestIntfPrx, _adapter->add(ICE_MAKE_SHARED(TestI),
                                          adapter->getCommunicator()->stringToIdentity("test"))))
 {
     _adapter->activate();
 }
 
-TestIntfPrx
+TestIntfPrxPtr
 RemoteObjectAdapterI::getTestIntf(const Ice::Current&)
 {
     return _testIntf;
@@ -157,7 +163,7 @@ TestI::interruptSleep(const Ice::Current& current)
 void
 TestI::waitForHeartbeat(int count, const Ice::Current& current)
 {
-    ConnectionCallbackIPtr callback = new ConnectionCallbackI();
+    ConnectionCallbackIPtr callback = ICE_MAKE_SHARED(ConnectionCallbackI);
     current.con->setCallback(callback);
     callback->waitForCount(count);
 }
diff --git a/cpp/test/Ice/acm/TestI.h b/cpp/test/Ice/acm/TestI.h
index c72d7b6a6b5..3a9a591083a 100644
--- a/cpp/test/Ice/acm/TestI.h
+++ b/cpp/test/Ice/acm/TestI.h
@@ -16,7 +16,7 @@ class RemoteCommunicatorI : public Test::RemoteCommunicator
 {
 public:
 
-    virtual Test::RemoteObjectAdapterPrx createObjectAdapter(int, int, int, const Ice::Current&);
+    virtual Test::RemoteObjectAdapterPrxPtr createObjectAdapter(int, int, int, const Ice::Current&);
     virtual void shutdown(const Ice::Current&);
 };
 
@@ -26,7 +26,7 @@ public:
 
     RemoteObjectAdapterI(const Ice::ObjectAdapterPtr&);
 
-    virtual Test::TestIntfPrx getTestIntf(const Ice::Current&);
+    virtual Test::TestIntfPrxPtr getTestIntf(const Ice::Current&);
     virtual void activate(const Ice::Current&);
     virtual void hold(const Ice::Current&);
     virtual void deactivate(const Ice::Current&);
@@ -34,7 +34,7 @@ public:
 private:
 
     const Ice::ObjectAdapterPtr _adapter;
-    const Test::TestIntfPrx _testIntf;
+    const Test::TestIntfPrxPtr _testIntf;
 };
 
 class TestI : public Test::TestIntf, private IceUtil::Monitor<IceUtil::Mutex>
diff --git a/cpp/test/Ice/adapterDeactivation/.depend.mak b/cpp/test/Ice/adapterDeactivation/.depend.mak
index 3fba0b9bd5a..9a51b63c683 100755
--- a/cpp/test/Ice/adapterDeactivation/.depend.mak
+++ b/cpp/test/Ice/adapterDeactivation/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -97,6 +99,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -105,6 +108,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -145,7 +149,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -159,6 +163,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -170,7 +175,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -224,6 +227,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -232,6 +236,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -272,7 +277,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -286,6 +291,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -297,7 +303,6 @@ AllTests.obj: \
     "$(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" \
@@ -320,7 +325,6 @@ AllTests.obj: \
     "$(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" \
@@ -371,6 +375,7 @@ TestI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -378,6 +383,7 @@ TestI.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -406,7 +412,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -419,6 +425,7 @@ TestI.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -430,7 +437,6 @@ TestI.obj: \
     "$(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" \
@@ -452,7 +458,6 @@ TestI.obj: \
     "$(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" \
@@ -481,6 +486,7 @@ ServantLocatorI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -489,6 +495,7 @@ ServantLocatorI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -529,7 +536,7 @@ ServantLocatorI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -543,6 +550,7 @@ ServantLocatorI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -554,7 +562,6 @@ ServantLocatorI.obj: \
     "$(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" \
@@ -577,7 +584,6 @@ ServantLocatorI.obj: \
     "$(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" \
@@ -611,6 +617,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -619,6 +626,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -659,7 +667,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -673,6 +681,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -684,7 +693,6 @@ Server.obj: \
     "$(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" \
@@ -706,7 +714,6 @@ Server.obj: \
     "$(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" \
@@ -739,6 +746,7 @@ Collocated.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -747,6 +755,7 @@ Collocated.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -787,7 +796,7 @@ Collocated.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -801,6 +810,7 @@ Collocated.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -812,7 +822,6 @@ Collocated.obj: \
     "$(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" \
@@ -834,7 +843,6 @@ Collocated.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/adapterDeactivation/AllTests.cpp b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
index 8186540cb30..c1661d22975 100644
--- a/cpp/test/Ice/adapterDeactivation/AllTests.cpp
+++ b/cpp/test/Ice/adapterDeactivation/AllTests.cpp
@@ -15,18 +15,22 @@ using namespace std;
 using namespace Ice;
 using namespace Test;
 
-TestIntfPrx
+TestIntfPrxPtr
 allTests(const CommunicatorPtr& communicator)
 {
     cout << "testing stringToProxy... " << flush;
-    ObjectPrx base = communicator->stringToProxy("test:default -p 12010");
+    ObjectPrxPtr base = communicator->stringToProxy("test:default -p 12010");
     test(base);
     cout << "ok" << endl;
 
     cout << "testing checked cast... " << flush;
-    TestIntfPrx obj = TestIntfPrx::checkedCast(base);
+    TestIntfPrxPtr obj = ICE_CHECKED_CAST(TestIntfPrx, base);
     test(obj);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(obj, base));
+#else
     test(obj == base);
+#endif
     cout << "ok" << endl;
 
     {
@@ -64,7 +68,11 @@ allTests(const CommunicatorPtr& communicator)
             Ice::InitializationData initData;
             initData.properties = communicator->getProperties()->clone();
             Ice::CommunicatorPtr comm = Ice::initialize(initData);
+#ifdef ICE_CPP11_MAPPING
+            comm->stringToProxy("test:default -p 12010")->ice_ping_async();
+#else
             comm->stringToProxy("test:default -p 12010")->begin_ice_ping();
+#endif
             comm->destroy();
         }
         cout << "ok" << endl;
diff --git a/cpp/test/Ice/adapterDeactivation/Client.cpp b/cpp/test/Ice/adapterDeactivation/Client.cpp
index d76c2bc2387..35e5e8abdca 100644
--- a/cpp/test/Ice/adapterDeactivation/Client.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Client.cpp
@@ -22,8 +22,8 @@ using namespace Test;
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
-    TestIntfPrx allTests(const CommunicatorPtr&);
-    TestIntfPrx obj = allTests(communicator);
+    TestIntfPrxPtr allTests(const CommunicatorPtr&);
+    TestIntfPrxPtr obj = allTests(communicator);
     return EXIT_SUCCESS;
 }
 
diff --git a/cpp/test/Ice/adapterDeactivation/Collocated.cpp b/cpp/test/Ice/adapterDeactivation/Collocated.cpp
index ef093c73098..67f6a550f39 100644
--- a/cpp/test/Ice/adapterDeactivation/Collocated.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Collocated.cpp
@@ -23,10 +23,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    ServantLocatorPtr locator = new ServantLocatorI;
+    ServantLocatorPtr locator = ICE_MAKE_SHARED(ServantLocatorI);
     adapter->addServantLocator(locator, "");
 
-    TestIntfPrx allTests(const CommunicatorPtr&);
+    TestIntfPrxPtr allTests(const CommunicatorPtr&);
     allTests(communicator);
 
     adapter->waitForDeactivate();
diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp
index bb5656c3b8c..a2aae5b77f6 100644
--- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp
+++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.cpp
@@ -26,25 +26,37 @@ ServantLocatorI::~ServantLocatorI()
 }
 
 Ice::ObjectPtr
+#ifdef ICE_CPP11_MAPPING
+ServantLocatorI::locate(const Ice::Current& current, std::shared_ptr<void>& cookie)
+#else
 ServantLocatorI::locate(const Ice::Current& current, Ice::LocalObjectPtr& cookie)
+#endif
 {
     test(!_deactivated);
 
     test(current.id.category == "");
     test(current.id.name == "test");
 
-    cookie = new CookieI;
+    cookie = ICE_MAKE_SHARED(CookieI);
 
-    return new TestI;
+    return ICE_MAKE_SHARED(TestI);
 }
 
 void
+#ifdef ICE_CPP11_MAPPING
+ServantLocatorI::finished(const Ice::Current&, const Ice::ObjectPtr&,
+                          const std::shared_ptr<void>& cookie)
+#else
 ServantLocatorI::finished(const Ice::Current&, const Ice::ObjectPtr&,
                           const Ice::LocalObjectPtr& cookie)
+#endif
 {
     test(!_deactivated);
-
+#ifdef ICE_CPP11_MAPPING
+    shared_ptr<CookieI> co = static_pointer_cast<CookieI>(cookie);
+#else
     CookiePtr co = CookiePtr::dynamicCast(cookie);
+#endif
     test(co);
     test(co->message() == "blahblah");
 }
diff --git a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h
index b5e9dfc5bdb..6f75cd63e41 100644
--- a/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h
+++ b/cpp/test/Ice/adapterDeactivation/ServantLocatorI.h
@@ -19,8 +19,13 @@ public:
     ServantLocatorI();
     virtual ~ServantLocatorI();
 
+#ifdef ICE_CPP11_MAPPING
+    virtual Ice::ObjectPtr locate(const Ice::Current&, ::std::shared_ptr<void>&);
+    virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const ::std::shared_ptr<void>&);
+#else
     virtual Ice::ObjectPtr locate(const Ice::Current&, Ice::LocalObjectPtr&);
     virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&);
+#endif
     virtual void deactivate(const std::string&);
 
 public:
diff --git a/cpp/test/Ice/adapterDeactivation/Server.cpp b/cpp/test/Ice/adapterDeactivation/Server.cpp
index 2213bfdbb62..b8e57302aad 100644
--- a/cpp/test/Ice/adapterDeactivation/Server.cpp
+++ b/cpp/test/Ice/adapterDeactivation/Server.cpp
@@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    ServantLocatorPtr locator = new ServantLocatorI;
+    ServantLocatorPtr locator = ICE_MAKE_SHARED(ServantLocatorI);
     adapter->addServantLocator(locator, "");
     adapter->activate();
     TEST_READY
diff --git a/cpp/test/Ice/adapterDeactivation/TestI.cpp b/cpp/test/Ice/adapterDeactivation/TestI.cpp
index 49a0d45b633..6c29a78d005 100644
--- a/cpp/test/Ice/adapterDeactivation/TestI.cpp
+++ b/cpp/test/Ice/adapterDeactivation/TestI.cpp
@@ -17,12 +17,15 @@ using namespace Ice;
 void
 TestI::transient(const Current& current)
 {
+    cerr << "TestI::transient" << endl;
     CommunicatorPtr communicator = current.adapter->getCommunicator();
     
     ObjectAdapterPtr adapter =
         communicator->createObjectAdapterWithEndpoints("TransientTestAdapter", "default -p 9999");
     adapter->activate();
+    cerr << "TestI::transient activate" << endl;
     adapter->destroy();
+    cerr << "TestI::transient ok" << endl;
 }
 
 void
diff --git a/cpp/test/Ice/admin/.depend.mak b/cpp/test/Ice/admin/.depend.mak
index 06a7e889e45..f062167f9e4 100755
--- a/cpp/test/Ice/admin/.depend.mak
+++ b/cpp/test/Ice/admin/.depend.mak
@@ -19,6 +19,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -27,6 +28,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -61,7 +63,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -70,6 +72,7 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -79,7 +82,6 @@ Test.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -102,6 +104,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -110,6 +113,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -150,7 +154,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -164,6 +168,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -175,7 +180,6 @@ Client.obj: \
     "$(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" \
@@ -198,7 +202,6 @@ Client.obj: \
     "$(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" \
@@ -230,6 +233,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -238,6 +242,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -278,7 +283,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -292,6 +297,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -303,7 +309,6 @@ AllTests.obj: \
     "$(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" \
@@ -326,7 +331,6 @@ AllTests.obj: \
     "$(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" \
@@ -358,6 +362,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -366,6 +371,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -400,7 +406,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -409,6 +415,7 @@ TestI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -435,7 +442,6 @@ TestI.obj: \
     "$(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" \
@@ -458,7 +464,6 @@ TestI.obj: \
     "$(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\Metrics.h" \
@@ -483,6 +488,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -491,6 +497,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -531,7 +538,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -545,6 +552,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -556,7 +564,6 @@ Server.obj: \
     "$(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" \
@@ -579,7 +586,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/admin/AllTests.cpp b/cpp/test/Ice/admin/AllTests.cpp
index 09f0fc2909c..43bf5d0fdfc 100644
--- a/cpp/test/Ice/admin/AllTests.cpp
+++ b/cpp/test/Ice/admin/AllTests.cpp
@@ -13,6 +13,7 @@
 
 using namespace std;
 using namespace Test;
+using namespace Ice;
 
 static void
 testFacets(const Ice::CommunicatorPtr& com, bool builtInFacets = true)
@@ -25,9 +26,9 @@ testFacets(const Ice::CommunicatorPtr& com, bool builtInFacets = true)
         test(com->findAdminFacet("Metrics"));
     }
     
-    TestFacetPtr f1 = new TestFacetI;
-    TestFacetPtr f2 = new TestFacetI;
-    TestFacetPtr f3 = new TestFacetI;
+    TestFacetPtr f1 = ICE_MAKE_SHARED(TestFacetI);
+    TestFacetPtr f2 = ICE_MAKE_SHARED(TestFacetI);
+    TestFacetPtr f3 = ICE_MAKE_SHARED(TestFacetI);
 
     com->addAdminFacet(f1, "Facet1");
     com->addAdminFacet(f2, "Facet2");
@@ -118,7 +119,7 @@ private:
     Ice::LogMessageSeq _expectedLogMessages;
 };
 
-typedef IceUtil::Handle<RemoteLoggerI> RemoteLoggerIPtr;
+ICE_DEFINE_PTR(RemoteLoggerIPtr, RemoteLoggerI);
 
 RemoteLoggerI::RemoteLoggerI() : _receivedCalls(0)
 {
@@ -259,8 +260,8 @@ allTests(const Ice::CommunicatorPtr& communicator)
     cout << "ok" << endl;
 
     string ref = "factory:default -p 12010 -t 10000";
-    RemoteCommunicatorFactoryPrx factory =
-        RemoteCommunicatorFactoryPrx::uncheckedCast(communicator->stringToProxy(ref));
+    RemoteCommunicatorFactoryPrxPtr factory =
+        ICE_UNCHECKED_CAST(RemoteCommunicatorFactoryPrx, communicator->stringToProxy(ref));
 
     string defaultHost = communicator->getProperties()->getProperty("Ice.Default.Host");
 
@@ -272,9 +273,13 @@ allTests(const Ice::CommunicatorPtr& communicator)
         Ice::PropertyDict props;
         props["Ice.Admin.Endpoints"] = "tcp -h " + defaultHost;
         props["Ice.Admin.InstanceName"] = "Test";
-        RemoteCommunicatorPrx com = factory->createCommunicator(props);
-        Ice::ObjectPrx obj = com->getAdmin();
+        RemoteCommunicatorPrxPtr com = factory->createCommunicator(props);
+        Ice::ObjectPrxPtr obj = com->getAdmin();
+#ifdef ICE_CPP11_MAPPING
+        shared_ptr<Ice::ProcessPrx> proc = Ice::checkedCast<Ice::ProcessPrx>(obj, "Process");
+#else
         Ice::ProcessPrx proc = Ice::ProcessPrx::checkedCast(obj, "Process");
+#endif
         proc->shutdown();
         com->waitForShutdown();
         com->destroy();
@@ -289,10 +294,13 @@ allTests(const Ice::CommunicatorPtr& communicator)
         props["Prop1"] = "1";
         props["Prop2"] = "2";
         props["Prop3"] = "3";
-        RemoteCommunicatorPrx com = factory->createCommunicator(props);
-        Ice::ObjectPrx obj = com->getAdmin();
+        RemoteCommunicatorPrxPtr com = factory->createCommunicator(props);
+        Ice::ObjectPrxPtr obj = com->getAdmin();
+#ifdef ICE_CPP11_MAPPING
+        shared_ptr<Ice::PropertiesAdminPrx> pa = Ice::checkedCast<Ice::PropertiesAdminPrx>(obj, "Properties");
+#else
         Ice::PropertiesAdminPrx pa = Ice::PropertiesAdminPrx::checkedCast(obj, "Properties");
-
+#endif
         //
         // Test: PropertiesAdmin::getProperty()
         //
@@ -353,15 +361,19 @@ allTests(const Ice::CommunicatorPtr& communicator)
         props["Ice.Admin.Endpoints"] = "tcp -h " + defaultHost;
         props["Ice.Admin.InstanceName"] = "Test";
         props["NullLogger"] = "1";
-        RemoteCommunicatorPrx com = factory->createCommunicator(props);
+        RemoteCommunicatorPrxPtr com = factory->createCommunicator(props);
 
         com->trace("testCat", "trace");
         com->warning("warning");
         com->error("error");
         com->print("print");
        
-        Ice::ObjectPrx obj = com->getAdmin();
+        Ice::ObjectPrxPtr obj = com->getAdmin();
+#ifdef ICE_CPP11_MAPPING
+        shared_ptr<Ice::LoggerAdminPrx> logger = Ice::checkedCast<Ice::LoggerAdminPrx>(obj, "Logger");
+#else
         Ice::LoggerAdminPrx logger = Ice::LoggerAdminPrx::checkedCast(obj, "Logger");
+#endif
         test(logger);
 
         string prefix;   
@@ -389,8 +401,8 @@ allTests(const Ice::CommunicatorPtr& communicator)
         com->warning("warning2");
         
         Ice::LogMessageTypeSeq messageTypes;
-        messageTypes.push_back(Ice::ErrorMessage);
-        messageTypes.push_back(Ice::WarningMessage);
+        messageTypes.push_back(ICE_ENUM(LogMessageType, ErrorMessage));
+        messageTypes.push_back(ICE_ENUM(LogMessageType, WarningMessage));
 
         logMessages = 
             logger->getLog(messageTypes, Ice::StringSeq(), -1, prefix);
@@ -400,7 +412,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         p = logMessages.begin();
         while(p != logMessages.end())
         {
-            test(p->type == Ice::ErrorMessage || p->type == Ice::WarningMessage);
+            test(p->type == ICE_ENUM(LogMessageType, ErrorMessage) || p->type == ICE_ENUM(LogMessageType, WarningMessage));
             ++p;
         }
         
@@ -412,8 +424,8 @@ allTests(const Ice::CommunicatorPtr& communicator)
         com->trace("testCat2", "B");
         
         messageTypes.clear();
-        messageTypes.push_back(Ice::ErrorMessage);
-        messageTypes.push_back(Ice::TraceMessage);
+        messageTypes.push_back(ICE_ENUM(LogMessageType, ErrorMessage));
+        messageTypes.push_back(ICE_ENUM(LogMessageType, TraceMessage));
         
         Ice::StringSeq categories;
         categories.push_back("testCat");
@@ -426,8 +438,8 @@ allTests(const Ice::CommunicatorPtr& communicator)
         p = logMessages.begin();
         while(p != logMessages.end())
         {
-            test(p->type == Ice::ErrorMessage || 
-                 (p->type == Ice::TraceMessage && p->traceCategory == "testCat"));
+            test(p->type == ICE_ENUM(LogMessageType, ErrorMessage) || 
+                (p->type == ICE_ENUM(LogMessageType, TraceMessage) && p->traceCategory == "testCat"));
             ++p;
         }
 
@@ -452,10 +464,10 @@ allTests(const Ice::CommunicatorPtr& communicator)
         Ice::ObjectAdapterPtr adapter = 
             communicator->createObjectAdapterWithEndpoints("RemoteLoggerAdapter", "tcp -h localhost");
    
-        RemoteLoggerIPtr remoteLogger = new RemoteLoggerI;
+        RemoteLoggerIPtr remoteLogger = ICE_MAKE_SHARED(RemoteLoggerI);
         
-        Ice::RemoteLoggerPrx myProxy = 
-            Ice::RemoteLoggerPrx::uncheckedCast(adapter->addWithUUID(remoteLogger));
+        Ice::RemoteLoggerPrxPtr myProxy = 
+            ICE_UNCHECKED_CAST(Ice::RemoteLoggerPrx, adapter->addWithUUID(remoteLogger));
         
         adapter->activate();
          
@@ -468,10 +480,10 @@ allTests(const Ice::CommunicatorPtr& communicator)
         logger->attachRemoteLogger(myProxy, Ice::LogMessageTypeSeq(), Ice::StringSeq(), -1);
         remoteLogger->wait(1);
 
-        remoteLogger->checkNextLog(Ice::TraceMessage, "rtrace", "testCat");
-        remoteLogger->checkNextLog(Ice::WarningMessage, "rwarning");
-        remoteLogger->checkNextLog(Ice::ErrorMessage, "rerror");
-        remoteLogger->checkNextLog(Ice::PrintMessage, "rprint");
+        remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, TraceMessage), "rtrace", "testCat");
+        remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, WarningMessage), "rwarning");
+        remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, ErrorMessage), "rerror");
+        remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, PrintMessage), "rprint");
 
         com->trace("testCat", "rtrace");
         com->warning("rwarning");
@@ -491,8 +503,8 @@ allTests(const Ice::CommunicatorPtr& communicator)
         logger->attachRemoteLogger(myProxy, messageTypes, categories, 4);
         remoteLogger->wait(1);
 
-        remoteLogger->checkNextLog(Ice::TraceMessage, "rtrace2", "testCat");
-        remoteLogger->checkNextLog(Ice::ErrorMessage, "rerror2");
+        remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, TraceMessage), "rtrace2", "testCat");
+        remoteLogger->checkNextLog(ICE_ENUM(LogMessageType, ErrorMessage), "rerror2");
      
         com->warning("rwarning2");
         com->trace("testCat", "rtrace2");
@@ -527,9 +539,13 @@ allTests(const Ice::CommunicatorPtr& communicator)
         Ice::PropertyDict props;
         props["Ice.Admin.Endpoints"] = "tcp -h " + defaultHost;
         props["Ice.Admin.InstanceName"] = "Test";
-        RemoteCommunicatorPrx com = factory->createCommunicator(props);
-        Ice::ObjectPrx obj = com->getAdmin();
+        RemoteCommunicatorPrxPtr com = factory->createCommunicator(props);
+        Ice::ObjectPrxPtr obj = com->getAdmin();
+#ifdef ICE_CPP11_MAPPING
+        shared_ptr<Test::TestFacetPrx> tf = Ice::checkedCast<Test::TestFacetPrx>(obj, "TestFacet");
+#else
         Test::TestFacetPrx tf = Test::TestFacetPrx::checkedCast(obj, "TestFacet");
+#endif
         tf->op();
         com->destroy();
     }
@@ -545,12 +561,19 @@ allTests(const Ice::CommunicatorPtr& communicator)
         props["Ice.Admin.Endpoints"] = "tcp -h " + defaultHost;
         props["Ice.Admin.InstanceName"] = "Test";
         props["Ice.Admin.Facets"] = "Properties";
-        RemoteCommunicatorPrx com = factory->createCommunicator(props);
-        Ice::ObjectPrx obj = com->getAdmin();
+        RemoteCommunicatorPrxPtr com = factory->createCommunicator(props);
+        Ice::ObjectPrxPtr obj = com->getAdmin();
+#ifdef ICE_CPP11_MAPPING
+        shared_ptr<Ice::ProcessPrx> proc = Ice::checkedCast<Ice::ProcessPrx>(obj, "Process");
+        test(!proc);
+        shared_ptr<Test::TestFacetPrx> tf = Ice::checkedCast<Test::TestFacetPrx>(obj, "TestFacet");
+        test(!tf);
+#else
         Ice::ProcessPrx proc = Ice::ProcessPrx::checkedCast(obj, "Process");
         test(!proc);
         Test::TestFacetPrx tf = Test::TestFacetPrx::checkedCast(obj, "TestFacet");
         test(!tf);
+#endif
         com->destroy();
     }
     {
@@ -562,12 +585,19 @@ allTests(const Ice::CommunicatorPtr& communicator)
         props["Ice.Admin.Endpoints"] = "tcp -h " + defaultHost;
         props["Ice.Admin.InstanceName"] = "Test";
         props["Ice.Admin.Facets"] = "Process";
-        RemoteCommunicatorPrx com = factory->createCommunicator(props);
-        Ice::ObjectPrx obj = com->getAdmin();
+        RemoteCommunicatorPrxPtr com = factory->createCommunicator(props);
+        Ice::ObjectPrxPtr obj = com->getAdmin();
+#ifdef ICE_CPP11_MAPPING
+        shared_ptr<Ice::PropertiesAdminPrx> pa = Ice::checkedCast<Ice::PropertiesAdminPrx>(obj, "Properties");
+        test(!pa);
+        shared_ptr<Test::TestFacetPrx> tf = Ice::checkedCast<Test::TestFacetPrx>(obj, "TestFacet");
+        test(!tf);
+#else
         Ice::PropertiesAdminPrx pa = Ice::PropertiesAdminPrx::checkedCast(obj, "Properties");
         test(!pa);
         Test::TestFacetPrx tf = Test::TestFacetPrx::checkedCast(obj, "TestFacet");
         test(!tf);
+#endif
         com->destroy();
     }
     {
@@ -579,12 +609,19 @@ allTests(const Ice::CommunicatorPtr& communicator)
         props["Ice.Admin.Endpoints"] = "tcp -h " + defaultHost;
         props["Ice.Admin.InstanceName"] = "Test";
         props["Ice.Admin.Facets"] = "TestFacet";
-        RemoteCommunicatorPrx com = factory->createCommunicator(props);
-        Ice::ObjectPrx obj = com->getAdmin();
+        RemoteCommunicatorPrxPtr com = factory->createCommunicator(props);
+        Ice::ObjectPrxPtr obj = com->getAdmin();
+#ifdef ICE_CPP11_MAPPING
+        shared_ptr<Ice::PropertiesAdminPrx> pa = Ice::checkedCast<Ice::PropertiesAdminPrx>(obj, "Properties");
+        test(!pa);
+        shared_ptr<Ice::ProcessPrx> proc = Ice::checkedCast<Ice::ProcessPrx>(obj, "Process");
+        test(!proc);
+#else
         Ice::PropertiesAdminPrx pa = Ice::PropertiesAdminPrx::checkedCast(obj, "Properties");
         test(!pa);
         Ice::ProcessPrx proc = Ice::ProcessPrx::checkedCast(obj, "Process");
         test(!proc);
+#endif
         com->destroy();
     }
     {
@@ -596,14 +633,23 @@ allTests(const Ice::CommunicatorPtr& communicator)
         props["Ice.Admin.Endpoints"] = "tcp -h " + defaultHost;
         props["Ice.Admin.InstanceName"] = "Test";
         props["Ice.Admin.Facets"] = "Properties TestFacet";
-        RemoteCommunicatorPrx com = factory->createCommunicator(props);
-        Ice::ObjectPrx obj = com->getAdmin();
+        RemoteCommunicatorPrxPtr com = factory->createCommunicator(props);
+        Ice::ObjectPrxPtr obj = com->getAdmin();
+#ifdef ICE_CPP11_MAPPING
+        shared_ptr<Ice::PropertiesAdminPrx> pa = Ice::checkedCast<Ice::PropertiesAdminPrx>(obj, "Properties");
+        test(pa->getProperty("Ice.Admin.InstanceName") == "Test");
+        shared_ptr<Test::TestFacetPrx> tf = Ice::checkedCast<Test::TestFacetPrx>(obj, "TestFacet");
+        tf->op();
+        shared_ptr<Ice::ProcessPrx> proc = Ice::checkedCast<Ice::ProcessPrx>(obj, "Process");
+        test(!proc);
+#else
         Ice::PropertiesAdminPrx pa = Ice::PropertiesAdminPrx::checkedCast(obj, "Properties");
         test(pa->getProperty("Ice.Admin.InstanceName") == "Test");
         Test::TestFacetPrx tf = Test::TestFacetPrx::checkedCast(obj, "TestFacet");
         tf->op();
         Ice::ProcessPrx proc = Ice::ProcessPrx::checkedCast(obj, "Process");
         test(!proc);
+#endif
         com->destroy();
     }
     {
@@ -615,13 +661,21 @@ allTests(const Ice::CommunicatorPtr& communicator)
         props["Ice.Admin.Endpoints"] = "tcp -h " + defaultHost;
         props["Ice.Admin.InstanceName"] = "Test";
         props["Ice.Admin.Facets"] = "TestFacet, Process";
-        RemoteCommunicatorPrx com = factory->createCommunicator(props);
-        Ice::ObjectPrx obj = com->getAdmin();
+        RemoteCommunicatorPrxPtr com = factory->createCommunicator(props);
+        Ice::ObjectPrxPtr obj = com->getAdmin();
+#ifdef ICE_CPP11_MAPPING
+        shared_ptr<Ice::PropertiesAdminPrx> pa = Ice::checkedCast<Ice::PropertiesAdminPrx>(obj, "Properties");
+        test(!pa);
+        shared_ptr<Test::TestFacetPrx> tf = Ice::checkedCast<Test::TestFacetPrx>(obj, "TestFacet");
+        tf->op();
+        shared_ptr<Ice::ProcessPrx> proc = Ice::checkedCast<Ice::ProcessPrx>(obj, "Process");
+#else
         Ice::PropertiesAdminPrx pa = Ice::PropertiesAdminPrx::checkedCast(obj, "Properties");
         test(!pa);
         Test::TestFacetPrx tf = Test::TestFacetPrx::checkedCast(obj, "TestFacet");
         tf->op();
         Ice::ProcessPrx proc = Ice::ProcessPrx::checkedCast(obj, "Process");
+#endif
         proc->shutdown();
         com->waitForShutdown();
         com->destroy();
diff --git a/cpp/test/Ice/admin/Server.cpp b/cpp/test/Ice/admin/Server.cpp
index a6dd71c2d1e..f3cd628be4a 100644
--- a/cpp/test/Ice/admin/Server.cpp
+++ b/cpp/test/Ice/admin/Server.cpp
@@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010 -t 10000");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::Identity id = communicator->stringToIdentity("factory");
-    adapter->add(new RemoteCommunicatorFactoryI, id);
+    adapter->add(ICE_MAKE_SHARED(RemoteCommunicatorFactoryI), id);
     adapter->activate();
     TEST_READY
     communicator->waitForShutdown();
diff --git a/cpp/test/Ice/admin/TestI.cpp b/cpp/test/Ice/admin/TestI.cpp
index dc6870a5d3c..3cd1188aa1f 100644
--- a/cpp/test/Ice/admin/TestI.cpp
+++ b/cpp/test/Ice/admin/TestI.cpp
@@ -19,7 +19,7 @@ namespace
 // A no-op Logger, used when testing the Logger Admin
 //
 
-class NullLogger : public Ice::Logger
+class NullLogger : public Ice::Logger, public ICE_ENABLE_SHARED_FROM_THIS(NullLogger)
 {
 public:
 
@@ -46,7 +46,7 @@ public:
     
     virtual Ice::LoggerPtr cloneWithPrefix(const string&)
     {
-        return this;
+        return ICE_SHARED_FROM_THIS;
     }
 };
 
@@ -59,7 +59,7 @@ RemoteCommunicatorI::RemoteCommunicatorI(const Ice::CommunicatorPtr& communicato
 {
 }
 
-Ice::ObjectPrx
+Ice::ObjectPrxPtr
 RemoteCommunicatorI::getAdmin(const Ice::Current&)
 {
     return _communicator->getAdmin();
@@ -141,7 +141,7 @@ RemoteCommunicatorI::updated(const Ice::PropertyDict& changes)
     notify();
 }
 
-Test::RemoteCommunicatorPrx
+Test::RemoteCommunicatorPrxPtr
 RemoteCommunicatorFactoryI::createCommunicator(const Ice::PropertyDict& props, const Ice::Current& current)
 {
     //
@@ -156,7 +156,7 @@ RemoteCommunicatorFactoryI::createCommunicator(const Ice::PropertyDict& props, c
 
     if(init.properties->getPropertyAsInt("NullLogger") > 0)
     {
-        init.logger = new NullLogger;
+        init.logger = ICE_MAKE_SHARED(NullLogger);
     }
 
     //
@@ -167,23 +167,23 @@ RemoteCommunicatorFactoryI::createCommunicator(const Ice::PropertyDict& props, c
     //
     // Install a custom admin facet.
     //
-    communicator->addAdminFacet(new TestFacetI, "TestFacet");
+    communicator->addAdminFacet(ICE_MAKE_SHARED(TestFacetI), "TestFacet");
 
     //
     // The RemoteCommunicator servant also implements PropertiesAdminUpdateCallback.
     // Set the callback on the admin facet.
     //
-    RemoteCommunicatorIPtr servant = new RemoteCommunicatorI(communicator);
+    RemoteCommunicatorIPtr servant = ICE_MAKE_SHARED(RemoteCommunicatorI, communicator);
     Ice::ObjectPtr propFacet = communicator->findAdminFacet("Properties");
     if(propFacet)
     {
-        Ice::NativePropertiesAdminPtr admin = Ice::NativePropertiesAdminPtr::dynamicCast(propFacet);
+        Ice::NativePropertiesAdminPtr admin = ICE_DYNAMIC_CAST(Ice::NativePropertiesAdmin, propFacet);
         assert(admin);
         admin->addUpdateCallback(servant);
     }
 
-    Ice::ObjectPrx proxy = current.adapter->addWithUUID(servant);
-    return Test::RemoteCommunicatorPrx::uncheckedCast(proxy);
+    Ice::ObjectPrxPtr proxy = current.adapter->addWithUUID(servant);
+    return ICE_UNCHECKED_CAST(Test::RemoteCommunicatorPrx, proxy);
 }
 
 void
diff --git a/cpp/test/Ice/admin/TestI.h b/cpp/test/Ice/admin/TestI.h
index aa8e913bb22..6539b48153d 100644
--- a/cpp/test/Ice/admin/TestI.h
+++ b/cpp/test/Ice/admin/TestI.h
@@ -21,7 +21,7 @@ public:
 
     RemoteCommunicatorI(const Ice::CommunicatorPtr&);
 
-    virtual Ice::ObjectPrx getAdmin(const Ice::Current&);
+    virtual Ice::ObjectPrxPtr getAdmin(const Ice::Current&);
     virtual Ice::PropertyDict getChanges(const Ice::Current&);
 
     virtual void print(const std::string&, const Ice::Current&);
@@ -41,13 +41,13 @@ private:
     Ice::PropertyDict _changes;
     bool _called;
 };
-typedef IceUtil::Handle<RemoteCommunicatorI> RemoteCommunicatorIPtr;
+ICE_DEFINE_PTR(RemoteCommunicatorIPtr, RemoteCommunicatorI);
 
 class RemoteCommunicatorFactoryI : public Test::RemoteCommunicatorFactory
 {
 public:
 
-    virtual Test::RemoteCommunicatorPrx createCommunicator(const Ice::PropertyDict&, const Ice::Current&);
+    virtual Test::RemoteCommunicatorPrxPtr createCommunicator(const Ice::PropertyDict&, const Ice::Current&);
     virtual void shutdown(const Ice::Current&);
 };
 
diff --git a/cpp/test/Ice/ami/.depend.mak b/cpp/test/Ice/ami/.depend.mak
index f9e651d5545..775d41b05d0 100755
--- a/cpp/test/Ice/ami/.depend.mak
+++ b/cpp/test/Ice/ami/.depend.mak
@@ -20,6 +20,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -28,6 +29,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -62,7 +64,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -71,13 +73,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Endpoint.h" \
     "$(includedir)\Ice\LocalException.h" \
@@ -103,6 +105,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -111,6 +114,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -151,7 +155,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -165,6 +169,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -176,7 +181,6 @@ Client.obj: \
     "$(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" \
@@ -199,7 +203,6 @@ Client.obj: \
     "$(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" \
@@ -231,6 +234,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -239,6 +243,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -279,7 +284,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -293,6 +298,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -304,7 +310,6 @@ AllTests.obj: \
     "$(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" \
@@ -327,7 +332,6 @@ AllTests.obj: \
     "$(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" \
@@ -359,6 +363,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -367,6 +372,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -401,7 +407,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -410,13 +416,13 @@ TestI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Endpoint.h" \
     "$(includedir)\Ice\Ice.h" \
@@ -458,7 +464,6 @@ TestI.obj: \
     "$(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" \
@@ -484,6 +489,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -492,6 +498,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -532,7 +539,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -546,6 +553,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -557,7 +565,6 @@ Server.obj: \
     "$(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" \
@@ -580,7 +587,6 @@ Server.obj: \
     "$(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" \
@@ -613,6 +619,7 @@ Collocated.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -621,6 +628,7 @@ Collocated.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -661,7 +669,7 @@ Collocated.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -675,6 +683,7 @@ Collocated.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -686,7 +695,6 @@ Collocated.obj: \
     "$(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" \
@@ -709,7 +717,6 @@ Collocated.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/ami/AllTests.cpp b/cpp/test/Ice/ami/AllTests.cpp
index 7ae4514bb09..c122840bff9 100644
--- a/cpp/test/Ice/ami/AllTests.cpp
+++ b/cpp/test/Ice/ami/AllTests.cpp
@@ -17,6 +17,9 @@ using namespace std;
 namespace
 {
 
+enum ThrowType { LocalException, UserException, StandardException, OtherException };
+
+#ifndef ICE_CPP11_MAPPING
 struct Cookie : public Ice::LocalObject
 {
     Cookie(int i) : val(i)
@@ -735,8 +738,6 @@ private:
 };
 typedef IceUtil::Handle<FlushExCallback> FlushExCallbackPtr;
 
-enum ThrowType { LocalException, UserException, StandardException, OtherException };
-
 class Thrower : public CallbackBase
 {
 public:
@@ -829,7 +830,7 @@ private:
             }
             case OtherException:
             {
-                    throw 99;
+                throw 99;
                 break;
             }
             default:
@@ -843,12 +844,1215 @@ private:
     ThrowType _t;
 };
 typedef IceUtil::Handle<Thrower> ThrowerPtr;
+#endif
 
 }
 
 void
 allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
 {
+#ifdef ICE_CPP11_MAPPING
+    string sref = "test:default -p 12010";
+    auto obj = communicator->stringToProxy(sref);
+    test(obj);
+
+    auto p = Ice::uncheckedCast<Test::TestIntfPrx>(obj);
+
+    sref = "testController:default -p 12011";
+    obj = communicator->stringToProxy(sref);
+    test(obj);
+
+    auto testController = Ice::uncheckedCast<Test::TestIntfControllerPrx>(obj);
+
+    Ice::Context ctx;
+    cout << "testing begin/end invocation... " << flush;
+    {
+        {
+            promise<bool> promise;
+            p->ice_isA_async(Test::TestIntf::ice_staticId(),
+                [&](bool value)
+                {
+                    promise.set_value(value);
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                });
+            test(promise.get_future().get());
+        }
+
+        {
+            promise<bool> promise;
+            p->ice_isA_async(Test::TestIntf::ice_staticId(),
+                [&](bool value)
+                {
+                    promise.set_value(value);
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                },
+                nullptr, ctx);
+            test(promise.get_future().get());
+        }
+
+                {
+            promise<void> promise;
+            p->ice_ping_async(
+                [&]()
+                {
+                    promise.set_value();
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                });
+            promise.get_future().get();
+        }
+
+        {
+            promise<void> promise;
+            p->ice_ping_async(
+                [&]()
+                {
+                    promise.set_value();
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                },
+                nullptr, ctx);
+            promise.get_future().get();
+        }
+
+        {
+            promise<string> promise;
+            p->ice_id_async(
+                [&](const string& id)
+                {
+                    promise.set_value(id);
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                });
+            test(promise.get_future().get() == Test::TestIntf::ice_staticId());
+        }
+
+        {
+            promise<string> promise;
+            p->ice_id_async(
+                [&](const string& id)
+                {
+                    promise.set_value(id);
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                },
+                nullptr, ctx);
+            test(promise.get_future().get() == Test::TestIntf::ice_staticId());
+        }
+
+        {
+            promise<vector<string>> promise;
+            p->ice_ids_async(
+                [&](const vector<string>& ids)
+                {
+                    promise.set_value(ids);
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                });
+            test(promise.get_future().get().size() == 2);
+        }
+
+        {
+            promise<vector<string>> promise;
+            p->ice_ids_async(
+                [&](const vector<string>& ids)
+                {
+                    promise.set_value(ids);
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                },
+                nullptr, ctx);
+            test(promise.get_future().get().size() == 2);
+        }
+
+        if(!collocated)
+        {
+            promise<Ice::ConnectionPtr> promise;
+            p->ice_getConnection_async(
+                [&](const Ice::ConnectionPtr& connection)
+                {
+                    promise.set_value(connection);
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                });
+            test(promise.get_future().get());
+        }
+
+        {
+            promise<void> promise;
+            p->op_async(
+                [&]()
+                {
+                    promise.set_value();
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                });
+            promise.get_future().get();
+        }
+
+        {
+            promise<void> promise;
+            p->op_async(
+                [&]()
+                {
+                    promise.set_value();
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                },
+                nullptr, ctx);
+            promise.get_future().get();
+        }
+
+        {
+            promise<int> promise;
+            p->opWithResult_async(
+                [&](int result)
+                {
+                    promise.set_value(result);
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                });
+            test(promise.get_future().get() == 15);
+        }
+
+        {
+            promise<int> promise;
+            p->opWithResult_async(
+                [&](int result)
+                {
+                    promise.set_value(result);
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                },
+                nullptr, ctx);
+            test(promise.get_future().get() == 15);
+        }
+
+        {
+            promise<void> promise;
+            p->opWithUE_async(
+                [&]()
+                {
+                    promise.set_value();
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                });
+
+            try
+            {
+                promise.get_future().get();
+                test(false);
+            }
+            catch(const Test::TestIntfException&)
+            {
+            }
+        }
+
+        {
+            promise<void> promise;
+            p->opWithUE_async(
+                [&]()
+                {
+                    promise.set_value();
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                },
+                nullptr, ctx);
+
+            try
+            {
+                promise.get_future().get();
+                test(false);
+            }
+            catch(const Test::TestIntfException&)
+            {
+            }
+        }
+    }
+    cout << "ok" << endl;
+
+    cout << "testing future API... " << flush;
+    {
+
+        test(p->ice_isA_async(Test::TestIntf::ice_staticId()).get());
+        test(p->ice_isA_async(Test::TestIntf::ice_staticId(), ctx).get());
+
+        p->ice_ping_async().get();
+        p->ice_ping_async(ctx).get();
+
+        test(p->ice_ids_async().get().size() == 2);
+        test(p->ice_ids_async(ctx).get().size() == 2);
+
+        if(!collocated)
+        {
+            test(p->ice_getConnection_async().get());
+        }
+
+        p->op_async().get();
+        p->op_async(ctx).get();
+
+        test(p->opWithResult_async().get() == 15);
+        test(p->opWithResult_async(ctx).get() == 15);
+
+
+        try
+        {
+            p->opWithUE_async().get();
+            test(false);
+        }
+        catch(const Test::TestIntfException&)
+        {
+        }
+
+        try
+        {
+            p->opWithUE_async(ctx).get();
+            test(false);
+        }
+        catch(const Test::TestIntfException&)
+        {
+        }
+    }
+    cout << "ok" << endl;
+
+    cout << "testing local exceptions... " << flush;
+    {
+        auto indirect = Ice::uncheckedCast<Test::TestIntfPrx>(p->ice_adapterId("dummy"));
+
+        {
+            promise<void> promise;
+            indirect->op_async(
+                [&]()
+                {
+                    promise.set_value();
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                });
+            try
+            {
+                promise.get_future().get();
+                test(false);
+            }
+            catch(const Ice::NoEndpointException&)
+            {
+            }
+        }
+
+        {
+            try
+            {
+                promise<int> promise;
+                p->ice_oneway()->opWithResult_async(
+                    [&](int value)
+                    {
+                        promise.set_value(value);
+                    },
+                    [&](const exception_ptr& ex)
+                    {
+                        promise.set_exception(ex);
+                    });
+                test(false);
+            }
+            catch(const IceUtil::IllegalArgumentException&)
+            {
+            }
+        }
+
+        //
+        // Check that CommunicatorDestroyedException is raised directly.
+        //
+        if(p->ice_getConnection())
+        {
+            Ice::InitializationData initData;
+            initData.properties = communicator->getProperties()->clone();
+            Ice::CommunicatorPtr ic = Ice::initialize(initData);
+            auto obj = ic->stringToProxy(p->ice_toString());
+            auto p2 = Ice::checkedCast<Test::TestIntfPrx>(obj);
+            ic->destroy();
+
+            try
+            {
+                promise<void> promise;
+                p2->op_async(
+                    [&]()
+                    {
+                        promise.set_value();
+                    },
+                    [&](const exception_ptr& ex)
+                    {
+                        promise.set_exception(ex);
+                    });
+                test(false);
+            }
+            catch(const Ice::CommunicatorDestroyedException&)
+            {
+                // Expected.
+            }
+        }
+    }
+    cout << "ok" << endl;
+
+    cout << "testing local exceptions with future API... " << flush;
+    {
+        auto indirect = Ice::uncheckedCast<Test::TestIntfPrx>(p->ice_adapterId("dummy"));
+        auto r = indirect->op_async();
+        try
+        {
+            r.get();
+            test(false);
+        }
+        catch(const Ice::NoEndpointException&)
+        {
+        }
+
+
+        try
+        {
+            p->ice_oneway()->opWithResult_async().get();
+            test(false);
+        }
+        catch(const IceUtil::IllegalArgumentException&)
+        {
+        }
+
+        //
+        // Check that CommunicatorDestroyedException is raised directly.
+        //
+        if(p->ice_getConnection())
+        {
+            Ice::InitializationData initData;
+            initData.properties = communicator->getProperties()->clone();
+            Ice::CommunicatorPtr ic = Ice::initialize(initData);
+            auto obj = ic->stringToProxy(p->ice_toString());
+            auto p2 = Ice::checkedCast<Test::TestIntfPrx>(obj);
+            ic->destroy();
+
+            try
+            {
+                p2->op_async();
+                test(false);
+            }
+            catch(const Ice::CommunicatorDestroyedException&)
+            {
+                // Expected.
+            }
+        }
+    }
+    cout << "ok" << endl;
+
+    cout << "testing exception callback... " << flush;
+    {
+        auto i = Ice::uncheckedCast<Test::TestIntfPrx>(p->ice_adapterId("dummy"));
+
+        {
+            promise<bool> promise;
+            i->ice_isA_async(Test::TestIntf::ice_staticId(),
+                [&](bool value)
+                {
+                    promise.set_value(value);
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                });
+            try
+            {
+                promise.get_future().get();
+                test(false);
+            }
+            catch(const Ice::NoEndpointException&)
+            {
+            }
+        }
+
+        {
+            promise<void> promise;
+            i->op_async(
+                [&]()
+                {
+                    promise.set_value();
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                });
+
+            try
+            {
+                promise.get_future().get();
+                test(false);
+            }
+            catch(const Ice::NoEndpointException&)
+            {
+            }
+        }
+
+        {
+            promise<void> promise;
+            i->opWithUE_async(
+                [&]()
+                {
+                    promise.set_value();
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                });
+
+            try
+            {
+                promise.get_future().get();
+                test(false);
+            }
+            catch(const Ice::NoEndpointException&)
+            {
+            }
+        }
+
+        // Ensures no exception is called when response is received
+        {
+            promise<bool> promise;
+            p->ice_isA_async(
+                Test::TestIntf::ice_staticId(),
+                [&](bool value)
+                {
+                    promise.set_value(value);
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                });
+            try
+            {
+                test(promise.get_future().get());
+            }
+            catch(...)
+            {
+                test(false);
+            }
+        }
+
+        {
+            promise<void> promise;
+            p->op_async(
+                [&]()
+                {
+                    promise.set_value();
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                });
+            try
+            {
+                promise.get_future().get();
+            }
+            catch(...)
+            {
+                test(false);
+            }
+        }
+
+        // If response is a user exception, it should be received.
+        {
+            promise<void> promise;
+            p->opWithUE_async(
+                [&]()
+                {
+                    promise.set_value();
+                },
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                });
+
+            try
+            {
+                promise.get_future().get();
+                test(false);
+            }
+            catch(const Test::TestIntfException&)
+            {
+            }
+        }
+    }
+    cout << "ok" << endl;
+
+    cout << "testing sent callback... " << flush;
+    {
+        {
+            promise<bool> response;
+            promise<bool> sent;
+
+            p->ice_isA_async("",
+                [&](bool value)
+                {
+                    response.set_value(value);
+                },
+                [&](const exception_ptr& ex)
+                {
+                    response.set_exception(ex);
+                },
+                [&](bool sentAsync)
+                {
+                    sent.set_value(sentAsync);
+                });
+
+            sent.get_future().get();
+            response.get_future().get();
+        }
+
+        {
+            promise<void> response;
+            promise<bool> sent;
+
+            p->ice_ping_async(
+                [&]()
+                {
+                    response.set_value();
+                },
+                [&](const exception_ptr& ex)
+                {
+                    response.set_exception(ex);
+                },
+                [&](bool sentAsync)
+                {
+                    sent.set_value(sentAsync);
+                });
+
+            sent.get_future().get();
+            response.get_future().get();
+        }
+
+        {
+            promise<string> response;
+            promise<bool> sent;
+
+            p->ice_id_async(
+                [&](string value)
+                {
+                    response.set_value(value);
+                },
+                [&](const exception_ptr& ex)
+                {
+                    response.set_exception(ex);
+                },
+                [&](bool sentAsync)
+                {
+                    sent.set_value(sentAsync);
+                });
+
+            sent.get_future().get();
+            response.get_future().get();
+        }
+
+        {
+            promise<vector<string>> response;
+            promise<bool> sent;
+
+            p->ice_ids_async(
+                [&](vector<string> value)
+                {
+                    response.set_value(value);
+                },
+                [&](const exception_ptr& ex)
+                {
+                    response.set_exception(ex);
+                },
+                [&](bool sentAsync)
+                {
+                    sent.set_value(sentAsync);
+                });
+
+            sent.get_future().get();
+            response.get_future().get();
+        }
+
+        {
+            promise<void> response;
+            promise<bool> sent;
+
+            p->op_async(
+                [&]()
+                {
+                    response.set_value();
+                },
+                [&](const exception_ptr& ex)
+                {
+                    response.set_exception(ex);
+                },
+                [&](bool sentAsync)
+                {
+                    sent.set_value(sentAsync);
+                });
+
+            sent.get_future().get();
+            response.get_future().get();
+        }
+
+        vector<future<bool>> futures;
+        Ice::ByteSeq seq;
+        seq.resize(1024);
+        testController->holdAdapter();
+        try
+        {
+            while(true)
+            {
+                promise<bool> promise;
+                p->opWithPayload_async(
+                    seq,
+                    []()
+                    {
+                    },
+                    [&](const exception_ptr& ex)
+                    {
+                        promise.set_exception(ex);
+                    },
+                    [&](bool sentAsync)
+                    {
+                        promise.set_value(sentAsync);
+                    });
+                future<bool> future = promise.get_future();
+                if(!future.get())
+                {
+                    break;
+                }
+                futures.push_back(move(future));
+            }
+        }
+        catch(...)
+        {
+            testController->resumeAdapter();
+            throw;
+        }
+        testController->resumeAdapter();
+    }
+    cout << "ok" << endl;
+
+    auto thrower = [](ThrowType t)
+        {
+            switch(t)
+            {
+                case LocalException:
+                {
+                    throw Ice::ObjectNotExistException(__FILE__, __LINE__);
+                    break;
+                }
+                case UserException:
+                {
+                    throw Test::TestIntfException();
+                    break;
+                }
+                case StandardException:
+                {
+                    throw ::std::bad_alloc();
+                    break;
+                }
+                case OtherException:
+                {
+                    throw 99;
+                    break;
+                }
+                default:
+                {
+                    assert(false);
+                    break;
+                }
+            }
+        };
+
+    cout << "testing unexpected exceptions from callback... " << flush;
+    {
+        auto q = Ice::uncheckedCast<Test::TestIntfPrx>(p->ice_adapterId("dummy"));
+        ThrowType throwEx[] = { LocalException, UserException, StandardException, OtherException };
+
+        for(int i = 0; i < 4; ++i)
+        {
+            {
+                promise<void> promise;
+                p->op_async(
+                    [&, i]()
+                    {
+                        promise.set_value();
+                        thrower(throwEx[i]);
+                    },
+                    [&](const exception_ptr& ex)
+                    {
+                        test(false);
+                    });
+
+                try
+                {
+                    promise.get_future().get();
+                }
+                catch(const exception& ex)
+                {
+                    cerr << ex.what() << endl;
+                    test(false);
+                }
+            }
+
+            {
+                promise<void> promise;
+                p->op_async(
+                    [&]()
+                    {
+                    },
+                    [&, i](const exception_ptr&)
+                    {
+                        test(false);
+                    },
+                    [&, i](bool)
+                    {
+                        promise.set_value();
+                        thrower(throwEx[i]);
+                    });
+
+                try
+                {
+                    promise.get_future().get();
+                }
+                catch(const exception&)
+                {
+                    test(false);
+                }
+            }
+        }
+    }
+    cout << "ok" << endl;
+
+    cout << "testing batch requests with proxy... " << flush;
+    {
+        {
+            test(p->opBatchCount() == 0);
+            auto b1 = p->ice_batchOneway();
+            b1->opBatch();
+            b1->opBatch();
+            auto id = this_thread::get_id();
+            promise<void> promise;
+            b1->ice_flushBatchRequests_async(
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                },
+                [&](bool sentSynchronously)
+                {
+                    test((sentSynchronously && id == this_thread::get_id()) ||
+                         (!sentSynchronously && id != this_thread::get_id()));
+                    promise.set_value();
+                });
+            promise.get_future().get();
+            test(p->waitForBatch(2));
+        }
+
+        if(p->ice_getConnection())
+        {
+            test(p->opBatchCount() == 0);
+            auto b1 = p->ice_batchOneway();
+            b1->opBatch();
+            b1->ice_getConnection()->close(false);
+
+            auto id = this_thread::get_id();
+            promise<void> promise;
+            b1->ice_flushBatchRequests_async(
+                [&](const exception_ptr& ex)
+                {
+                    promise.set_exception(ex);
+                },
+                [&](bool sentSynchronously)
+                {
+                    test((sentSynchronously && id == this_thread::get_id()) ||
+                         (!sentSynchronously && id != this_thread::get_id()));
+                    promise.set_value();
+                });
+            promise.get_future().get();
+            test(p->waitForBatch(1));
+        }
+    }
+    cout << "ok" << endl;
+
+    if(p->ice_getConnection()) // No collocation optimization
+    {
+        cout << "testing batch requests with connection... " << flush;
+        {
+            {
+                test(p->opBatchCount() == 0);
+                auto b1 = Ice::uncheckedCast<Test::TestIntfPrx>(
+                    p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway());
+                b1->opBatch();
+                b1->opBatch();
+
+                auto id = this_thread::get_id();
+                promise<void> promise;
+
+                b1->ice_getConnection()->flushBatchRequests_async(
+                    nullptr,
+                    [&](const exception_ptr& ex)
+                    {
+                        promise.set_exception(ex);
+                    },
+                    [&](bool sentSynchronously)
+                    {
+                        test((sentSynchronously && id == this_thread::get_id()) ||
+                            (!sentSynchronously && id != this_thread::get_id()));
+                        promise.set_value();
+                    });
+                promise.get_future().get();
+                test(p->waitForBatch(2));
+            }
+
+            {
+                // Ensure it also works with a twoway proxy
+                auto id = this_thread::get_id();
+                promise<void> promise;
+                p->ice_getConnection()->flushBatchRequests_async(
+                    nullptr,
+                    [&](const exception_ptr& ex)
+                    {
+                        promise.set_exception(ex);
+                    },
+                    [&](bool sentSynchronously)
+                    {
+                        test((sentSynchronously && id == this_thread::get_id()) ||
+                            (!sentSynchronously && id != this_thread::get_id()));
+                        promise.set_value();
+                    });
+                promise.get_future().get();
+            }
+
+            {
+                test(p->opBatchCount() == 0);
+                auto b1 = Ice::uncheckedCast<Test::TestIntfPrx>(
+                    p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway());
+                b1->opBatch();
+                b1->ice_getConnection()->close(false);
+
+                promise<void> promise;
+                b1->ice_getConnection()->flushBatchRequests_async(
+                    nullptr,
+                    [&](exception_ptr ex)
+                    {
+                        promise.set_exception(move(ex));
+                    },
+                    [&](bool)
+                    {
+                        promise.set_value();
+                    });
+
+                try
+                {
+                    promise.get_future().get();
+                    test(false);
+                }
+                catch(const Ice::LocalException&)
+                {
+                }
+                test(p->opBatchCount() == 0);
+            }
+        }
+        cout << "ok" << endl;
+
+        cout << "testing batch requests with communicator... " << flush;
+        {
+            {
+                //
+                // 1 connection.
+                //
+                test(p->opBatchCount() == 0);
+                auto b1 = Ice::uncheckedCast<Test::TestIntfPrx>(
+                    p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway());
+                b1->opBatch();
+                b1->opBatch();
+
+                promise<void> promise;
+                auto id = this_thread::get_id();
+                communicator->flushBatchRequests_async(
+                    nullptr,
+                    [&](exception_ptr ex)
+                    {
+                        promise.set_exception(move(ex));
+                    },
+                    [&](bool sentSynchronously)
+                    {
+                        test((sentSynchronously && id == this_thread::get_id()) ||
+                             (!sentSynchronously && id != this_thread::get_id()));
+                        promise.set_value();
+                    });
+                promise.get_future().get();
+                test(p->waitForBatch(2));
+            }
+
+            {
+                //
+                // Exception - 1 connection.
+                //
+                test(p->opBatchCount() == 0);
+                auto b1 = Ice::uncheckedCast<Test::TestIntfPrx>(
+                    p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway());
+                b1->opBatch();
+                b1->ice_getConnection()->close(false);
+
+                promise<void> promise;
+                auto id = this_thread::get_id();
+                communicator->flushBatchRequests_async(
+                    nullptr,
+                    [&](exception_ptr ex)
+                    {
+                        promise.set_exception(move(ex));
+                    },
+                    [&](bool sentSynchronously)
+                    {
+                        test((sentSynchronously && id == this_thread::get_id()) ||
+                             (!sentSynchronously && id != this_thread::get_id()));
+                        promise.set_value();
+                    });
+                promise.get_future().get(); // Exceptions are ignored!
+                test(p->opBatchCount() == 0);
+            }
+
+            {
+                //
+                // 2 connections.
+                //
+                test(p->opBatchCount() == 0);
+                auto b1 = Ice::uncheckedCast<Test::TestIntfPrx>(
+                    p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway());
+                auto b2 = Ice::uncheckedCast<Test::TestIntfPrx>(
+                    p->ice_connectionId("2")->ice_getConnection()->createProxy(
+                        p->ice_getIdentity())->ice_batchOneway());
+                b2->ice_getConnection(); // Ensure connection is established.
+                b1->opBatch();
+                b1->opBatch();
+                b2->opBatch();
+                b2->opBatch();
+
+                promise<void> promise;
+                auto id = this_thread::get_id();
+                communicator->flushBatchRequests_async(
+                    nullptr,
+                    [&](exception_ptr ex)
+                    {
+                        promise.set_exception(move(ex));
+                    },
+                    [&](bool sentSynchronously)
+                    {
+                        test((sentSynchronously && id == this_thread::get_id()) ||
+                             (!sentSynchronously && id != this_thread::get_id()));
+                        promise.set_value();
+                    });
+                promise.get_future().get();
+                test(p->waitForBatch(4));
+            }
+
+            {
+                //
+                // 2 connections - 2 failures.
+                //
+                // The sent callback should be invoked even if all connections fail.
+                //
+                test(p->opBatchCount() == 0);
+                auto b1 = Ice::uncheckedCast<Test::TestIntfPrx>(
+                    p->ice_getConnection()->createProxy(p->ice_getIdentity())->ice_batchOneway());
+                auto b2 = Ice::uncheckedCast<Test::TestIntfPrx>(
+                    p->ice_connectionId("2")->ice_getConnection()->createProxy(
+                        p->ice_getIdentity())->ice_batchOneway());
+
+                b2->ice_getConnection(); // Ensure connection is established.
+                b1->opBatch();
+                b2->opBatch();
+                b1->ice_getConnection()->close(false);
+                b2->ice_getConnection()->close(false);
+
+                promise<void> promise;
+                auto id = this_thread::get_id();
+                communicator->flushBatchRequests_async(
+                    nullptr,
+                    [&](exception_ptr ex)
+                    {
+                        promise.set_exception(move(ex));
+                    },
+                    [&](bool sentSynchronously)
+                    {
+                        test((sentSynchronously && id == this_thread::get_id()) ||
+                             (!sentSynchronously && id != this_thread::get_id()));
+                        promise.set_value();
+                    });
+                promise.get_future().get(); // Exceptions are ignored!
+                test(p->opBatchCount() == 0);
+            }
+        }
+        cout << "ok" << endl;
+
+        cout << "testing cancel operations... " << flush;
+        {
+            if(p->ice_getConnection())
+            {
+                testController->holdAdapter();
+                {
+                    promise<void> promise;
+                    auto cancel = p->ice_ping_async(
+                        [&]()
+                        {
+                            promise.set_value();
+                        },
+                        [&](exception_ptr ex)
+                        {
+                            promise.set_exception(ex);
+                        });
+                    cancel();
+
+                    try
+                    {
+                        promise.get_future().get();
+                        test(false);
+                    }
+                    catch(const Ice::InvocationCanceledException&)
+                    {
+                    }
+                    catch(...)
+                    {
+                        testController->resumeAdapter();
+                        throw;
+                    }
+                }
+
+                {
+                    promise<void> promise;
+                    auto cancel = p->ice_id_async(
+                        [&](string)
+                        {
+                            promise.set_value();
+                        },
+                        [&](exception_ptr ex)
+                        {
+                            promise.set_exception(ex);
+                        });
+                    cancel();
+
+                    try
+                    {
+                        promise.get_future().get();
+                        test(false);
+                    }
+                    catch(const Ice::InvocationCanceledException&)
+                    {
+                    }
+                    catch(...)
+                    {
+                        testController->resumeAdapter();
+                        throw;
+                    }
+                }
+                testController->resumeAdapter();
+            }
+        }
+        cout << "ok" << endl;
+//
+//  TODO port this to use the C++11 callback API
+//
+//         if(p->ice_getConnection())
+//         {
+//             cout << "testing close connection with sending queue... " << flush;
+//             {
+//                 Ice::ByteSeq seq;
+//                 seq.resize(1024 * 10);
+//                 for(Ice::ByteSeq::iterator q = seq.begin(); q != seq.end(); ++q)
+//                 {
+//                     *q = static_cast<Ice::Byte>(IceUtilInternal::random(255));
+//                 }
+//
+//
+//                 Send multiple opWithPayload, followed by a close and followed by multiple opWithPaylod.
+//                 The goal is to make sure that none of the opWithPayload fail even if the server closes
+//                 the connection gracefully in between.
+//
+//                 int maxQueue = 2;
+//                 bool done = false;
+//                 while(!done && maxQueue < 5000)
+//                 {
+//                     done = true;
+//                     p->ice_ping();
+//                     vector<Ice::AsyncResultPtr> results;
+//                     for(int i = 0; i < maxQueue; ++i)
+//                     {
+//                         results.push_back(p->begin_opWithPayload(seq));
+//                     }
+//                     if(!p->begin_close(false)->isSent())
+//                     {
+//                         for(int i = 0; i < maxQueue; i++)
+//                         {
+//                             Ice::AsyncResultPtr r = p->begin_opWithPayload(seq);
+//                             results.push_back(r);
+//                             if(r->isSent())
+//                             {
+//                                 done = false;
+//                                 maxQueue *= 2;
+//                                 break;
+//                             }
+//                         }
+//                     }
+//                     else
+//                     {
+//                         maxQueue *= 2;
+//                         done = false;
+//                     }
+//
+//                     cerr << maxQueue << endl;
+//                     for(vector<Ice::AsyncResultPtr>::const_iterator p = results.begin(); p != results.end(); ++p)
+//                     {
+//                         (*p)->waitForCompleted();
+//                         try
+//                         {
+//                             (*p)->throwLocalException();
+//                         }
+//                         catch(const Ice::LocalException&)
+//                         {
+//                             test(false);
+//                         }
+//                     }
+//                 }
+//             }
+//             cout << "ok" << endl;
+//         }
+
+    }
+
+    p->shutdown();
+#else
     string sref = "test:default -p 12010";
     Ice::ObjectPrx obj = communicator->stringToProxy(sref);
     test(obj);
@@ -1003,7 +2207,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     }
     cout << "ok" << endl;
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     cout << "testing C++11 async callback... " << flush;
     {
         AsyncCallbackPtr cb = new AsyncCallback();
@@ -1148,7 +2352,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     }
     cout << "ok" << endl;
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     cout << "testing C++11 response callback... " << flush;
     {
         ResponseCallbackPtr cb = new ResponseCallback();
@@ -1342,7 +2546,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     }
     cout << "ok" << endl;
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     cout << "testing local exceptions with C++11 response callback... " << flush;
     {
         Test::TestIntfPrx i = Test::TestIntfPrx::uncheckedCast(p->ice_adapterId("dummy"));
@@ -1422,7 +2626,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     }
     cout << "ok" << endl;
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     cout << "testing C++11 exception callback... " << flush;
     {
         Test::TestIntfPrx i = Test::TestIntfPrx::uncheckedCast(p->ice_adapterId("dummy"));
@@ -1530,7 +2734,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     }
     cout << "ok" << endl;
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     cout << "testing C++11 sent callback... " << flush;
     {
         SentCallbackPtr cb = new SentCallback;
@@ -1746,7 +2950,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     }
     cout << "ok" << endl;
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     cout << "testing unexpected exceptions from C++11 callback... " << flush;
     {
         Test::TestIntfPrx q = Test::TestIntfPrx::uncheckedCast(p->ice_adapterId("dummy"));
@@ -1917,7 +3121,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
     }
     cout << "ok" << endl;
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     cout << "testing C++11 batch requests with proxy... " << flush;
     {
 
@@ -2111,7 +3315,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
         }
         cout << "ok" << endl;
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
         cout << "testing C++11 batch requests with connection... " << flush;
         {
             if(p->ice_getConnection())
@@ -2463,7 +3667,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
         }
         cout << "ok" << endl;
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
         cout << "testing C++11 batch requests with communicator... " << flush;
         {
             {
@@ -2802,7 +4006,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
             //
             int maxQueue = 2;
             bool done = false;
-            while(!done && maxQueue < 50)
+            while(!done && maxQueue < 5000)
             {
                 done = true;
                 p->ice_ping();
@@ -2830,6 +4034,7 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
                     maxQueue *= 2;
                     done = false;
                 }
+
                 for(vector<Ice::AsyncResultPtr>::const_iterator p = results.begin(); p != results.end(); ++p)
                 {
                     (*p)->waitForCompleted();
@@ -2847,4 +4052,5 @@ allTests(const Ice::CommunicatorPtr& communicator, bool collocated)
         cout << "ok" << endl;
     }
     p->shutdown();
+#endif
 }
diff --git a/cpp/test/Ice/ami/Collocated.cpp b/cpp/test/Ice/ami/Collocated.cpp
index d1cc8f97a87..2ca1426f036 100644
--- a/cpp/test/Ice/ami/Collocated.cpp
+++ b/cpp/test/Ice/ami/Collocated.cpp
@@ -26,9 +26,9 @@ run(int, char**, const Ice::CommunicatorPtr& communicator,
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("ControllerAdapter");
 
-    TestIntfControllerIPtr testController = new TestIntfControllerI(adapter);
+    TestIntfControllerIPtr testController = ICE_MAKE_SHARED(TestIntfControllerI, adapter);
 
-    adapter->add(new TestIntfI(), communicator->stringToIdentity("test"));
+    adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test"));
     //adapter->activate(); // Collocated test doesn't need to activate the OA
 
     adapter2->add(testController, communicator->stringToIdentity("testController"));
diff --git a/cpp/test/Ice/ami/Server.cpp b/cpp/test/Ice/ami/Server.cpp
index 52553ba29d8..91485d90e0e 100644
--- a/cpp/test/Ice/ami/Server.cpp
+++ b/cpp/test/Ice/ami/Server.cpp
@@ -25,9 +25,9 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("ControllerAdapter");
 
-    TestIntfControllerIPtr testController = new TestIntfControllerI(adapter);
+    TestIntfControllerIPtr testController = ICE_MAKE_SHARED(TestIntfControllerI, adapter);
 
-    adapter->add(new TestIntfI(), communicator->stringToIdentity("test"));
+    adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test"));
     adapter->activate();
 
     adapter2->add(testController, communicator->stringToIdentity("testController"));
diff --git a/cpp/test/Ice/ami/TestI.h b/cpp/test/Ice/ami/TestI.h
index b47d7be0d53..8e9a0128ee2 100644
--- a/cpp/test/Ice/ami/TestI.h
+++ b/cpp/test/Ice/ami/TestI.h
@@ -13,7 +13,7 @@
 #include <Test.h>
 
 class TestIntfControllerI;
-typedef IceUtil::Handle<TestIntfControllerI> TestIntfControllerIPtr;
+ICE_DEFINE_PTR(TestIntfControllerIPtr, TestIntfControllerI);
 
 class TestIntfI : virtual public Test::TestIntf, public IceUtil::Monitor<IceUtil::Mutex>
 {
diff --git a/cpp/test/Ice/background/.depend.mak b/cpp/test/Ice/background/.depend.mak
index 15a6b85c5df..723fe082531 100755
--- a/cpp/test/Ice/background/.depend.mak
+++ b/cpp/test/Ice/background/.depend.mak
@@ -20,6 +20,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -28,6 +29,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -62,7 +64,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -71,6 +73,7 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -78,7 +81,6 @@ Test.obj: \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Endpoint.h" \
     "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -119,6 +121,7 @@ Configuration.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -126,6 +129,7 @@ Configuration.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -157,7 +161,7 @@ Configuration.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -206,6 +210,7 @@ Connector.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -213,6 +218,7 @@ Connector.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Identity.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -244,7 +250,7 @@ Connector.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -263,6 +269,7 @@ Connector.obj: \
     "..\..\..\src\Ice\AcceptorF.h" \
     "Test.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -290,6 +297,7 @@ Acceptor.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -298,6 +306,7 @@ Acceptor.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -332,7 +341,7 @@ Acceptor.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -349,6 +358,7 @@ Acceptor.obj: \
     "Test.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -385,6 +395,7 @@ EndpointI.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -393,6 +404,7 @@ EndpointI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\Ice\Version.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
@@ -432,7 +444,7 @@ EndpointI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -441,6 +453,7 @@ EndpointI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -487,6 +500,7 @@ Transceiver.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -495,6 +509,7 @@ Transceiver.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -533,7 +548,7 @@ Transceiver.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -584,6 +599,7 @@ EndpointFactory.obj: \
     "$(includedir)\Ice\ProxyF.h" \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -592,6 +608,7 @@ EndpointFactory.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -629,7 +646,7 @@ EndpointFactory.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -638,6 +655,7 @@ EndpointFactory.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -683,6 +701,7 @@ PluginI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -691,6 +710,7 @@ PluginI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -718,7 +738,7 @@ PluginI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -772,6 +792,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -780,6 +801,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -820,7 +842,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -834,6 +856,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -845,7 +868,6 @@ Client.obj: \
     "$(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" \
@@ -868,7 +890,6 @@ Client.obj: \
     "$(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" \
@@ -928,6 +949,7 @@ AllTests.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -935,6 +957,7 @@ AllTests.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -963,7 +986,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -976,6 +999,7 @@ AllTests.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -987,7 +1011,6 @@ AllTests.obj: \
     "$(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" \
@@ -1009,7 +1032,6 @@ AllTests.obj: \
     "$(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" \
@@ -1045,6 +1067,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1053,6 +1076,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1087,7 +1111,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1096,6 +1120,7 @@ TestI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1135,7 +1160,6 @@ TestI.obj: \
     "$(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" \
@@ -1156,7 +1180,6 @@ TestI.obj: \
     "$(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" \
@@ -1182,6 +1205,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1190,6 +1214,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1230,7 +1255,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1244,6 +1269,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1255,7 +1281,6 @@ Server.obj: \
     "$(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" \
@@ -1278,7 +1303,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/binding/.depend.mak b/cpp/test/Ice/binding/.depend.mak
index cb2d0107ae0..18a8a89bb98 100755
--- a/cpp/test/Ice/binding/.depend.mak
+++ b/cpp/test/Ice/binding/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -225,6 +228,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Handle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -233,6 +237,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -273,7 +278,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -287,6 +292,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -298,7 +304,6 @@ AllTests.obj: \
     "$(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" \
@@ -321,7 +326,6 @@ AllTests.obj: \
     "$(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" \
@@ -353,6 +357,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -361,6 +366,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -401,7 +407,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -415,6 +421,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -426,7 +433,6 @@ TestI.obj: \
     "$(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" \
@@ -449,7 +455,6 @@ TestI.obj: \
     "$(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" \
@@ -477,6 +482,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -485,6 +491,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -525,7 +532,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -539,6 +546,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -550,7 +558,6 @@ Server.obj: \
     "$(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" \
@@ -573,7 +580,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/checksum/.depend.mak b/cpp/test/Ice/checksum/.depend.mak
index 14cb5bb9697..9b011f090ef 100755
--- a/cpp/test/Ice/checksum/.depend.mak
+++ b/cpp/test/Ice/checksum/.depend.mak
@@ -20,6 +20,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -28,6 +29,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -62,7 +64,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -71,6 +73,7 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -78,7 +81,6 @@ Test.obj: \
     "$(includedir)\Ice\SliceChecksumDict.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -100,6 +102,7 @@ Types.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -108,6 +111,7 @@ Types.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -142,7 +146,7 @@ Types.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -151,13 +155,13 @@ Types.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -184,6 +188,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -192,6 +197,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -232,7 +238,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -246,6 +252,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -257,7 +264,6 @@ Client.obj: \
     "$(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" \
@@ -280,7 +286,6 @@ Client.obj: \
     "$(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" \
@@ -312,6 +317,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -320,6 +326,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -360,7 +367,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -374,6 +381,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -385,7 +393,6 @@ AllTests.obj: \
     "$(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" \
@@ -408,7 +415,6 @@ AllTests.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/checksum/server/.depend.mak b/cpp/test/Ice/checksum/server/.depend.mak
index 97ad822df9e..c258390bd20 100755
--- a/cpp/test/Ice/checksum/server/.depend.mak
+++ b/cpp/test/Ice/checksum/server/.depend.mak
@@ -20,6 +20,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -28,6 +29,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -62,7 +64,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -71,6 +73,7 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -78,7 +81,6 @@ Test.obj: \
     "$(includedir)\Ice\SliceChecksumDict.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -100,6 +102,7 @@ Types.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -108,6 +111,7 @@ Types.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -142,7 +146,7 @@ Types.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -151,13 +155,13 @@ Types.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -184,6 +188,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -192,6 +197,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -232,7 +238,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -246,6 +252,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -257,7 +264,6 @@ TestI.obj: \
     "$(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" \
@@ -280,7 +286,6 @@ TestI.obj: \
     "$(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" \
@@ -308,6 +313,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -316,6 +322,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -356,7 +363,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -370,6 +377,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -381,7 +389,6 @@ Server.obj: \
     "$(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" \
@@ -404,7 +411,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/custom/.depend.mak b/cpp/test/Ice/custom/.depend.mak
index faef600cfab..a4631617e10 100755
--- a/cpp/test/Ice/custom/.depend.mak
+++ b/cpp/test/Ice/custom/.depend.mak
@@ -25,6 +25,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -33,6 +34,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -67,7 +69,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -76,13 +78,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.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" \
     "MyByteSeq.h" \
     "CustomMap.h" \
     "CustomBuffer.h" \
@@ -128,7 +130,6 @@ Test.obj: \
     "$(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" \
@@ -153,6 +154,7 @@ Wstring.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -161,6 +163,7 @@ Wstring.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -195,7 +198,7 @@ Wstring.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -204,13 +207,13 @@ Wstring.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -235,6 +238,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -243,6 +247,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -283,7 +288,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -297,6 +302,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -308,7 +314,6 @@ Client.obj: \
     "$(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" \
@@ -331,7 +336,6 @@ Client.obj: \
     "$(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" \
@@ -368,6 +372,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -376,6 +381,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -416,7 +422,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -430,6 +436,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -441,7 +448,6 @@ AllTests.obj: \
     "$(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" \
@@ -464,7 +470,6 @@ AllTests.obj: \
     "$(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" \
@@ -515,6 +520,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -523,6 +529,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -557,7 +564,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -566,6 +573,7 @@ TestI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -585,7 +593,6 @@ TestI.obj: \
     "Test.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "MyByteSeq.h" \
     "CustomMap.h" \
     "CustomBuffer.h" \
@@ -619,7 +626,6 @@ TestI.obj: \
     "$(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" \
@@ -644,6 +650,7 @@ WstringI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -652,6 +659,7 @@ WstringI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -686,7 +694,7 @@ WstringI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -695,13 +703,13 @@ WstringI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.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" \
 
 Server.obj: \
 	Server.cpp \
@@ -719,6 +727,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -727,6 +736,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -767,7 +777,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -781,6 +791,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -792,7 +803,6 @@ Server.obj: \
     "$(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" \
@@ -815,7 +825,6 @@ Server.obj: \
     "$(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" \
@@ -853,6 +862,7 @@ TestAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -861,6 +871,7 @@ TestAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -895,7 +906,7 @@ TestAMD.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -904,6 +915,7 @@ TestAMD.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -911,7 +923,6 @@ TestAMD.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "MyByteSeq.h" \
     "CustomMap.h" \
     "CustomBuffer.h" \
@@ -956,7 +967,6 @@ TestAMD.obj: \
     "$(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" \
@@ -981,6 +991,7 @@ TestAMDI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -989,6 +1000,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1023,7 +1035,7 @@ TestAMDI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1032,6 +1044,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1051,7 +1064,6 @@ TestAMDI.obj: \
     "TestAMD.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "MyByteSeq.h" \
     "CustomMap.h" \
     "CustomBuffer.h" \
@@ -1085,7 +1097,6 @@ TestAMDI.obj: \
     "$(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" \
@@ -1109,6 +1120,7 @@ WstringAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1117,6 +1129,7 @@ WstringAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1151,7 +1164,7 @@ WstringAMD.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1160,6 +1173,7 @@ WstringAMD.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1167,7 +1181,6 @@ WstringAMD.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -1191,6 +1204,7 @@ WstringAMDI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1199,6 +1213,7 @@ WstringAMDI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1233,7 +1248,7 @@ WstringAMDI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1242,6 +1257,7 @@ WstringAMDI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1249,7 +1265,6 @@ WstringAMDI.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
 
 ServerAMD.obj: \
 	ServerAMD.cpp \
@@ -1267,6 +1282,7 @@ ServerAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1275,6 +1291,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1315,7 +1332,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1329,6 +1346,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1340,7 +1358,6 @@ ServerAMD.obj: \
     "$(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" \
@@ -1363,7 +1380,6 @@ ServerAMD.obj: \
     "$(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" \
@@ -1403,6 +1419,7 @@ Collocated.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1411,6 +1428,7 @@ Collocated.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1451,7 +1469,7 @@ Collocated.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1465,6 +1483,7 @@ Collocated.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1476,7 +1495,6 @@ Collocated.obj: \
     "$(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" \
@@ -1499,7 +1517,6 @@ Collocated.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/custom/AllTests.cpp b/cpp/test/Ice/custom/AllTests.cpp
index bb867f79cfa..1ba93ec0f39 100644
--- a/cpp/test/Ice/custom/AllTests.cpp
+++ b/cpp/test/Ice/custom/AllTests.cpp
@@ -2274,7 +2274,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
 
     cout << "ok" << endl;
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
 
     cout << "testing alternate strings with new C++11 AMI callbacks... " << flush;
     {
@@ -3120,7 +3120,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
     cout << "ok" << endl;
 
-#ifdef ICE_CPP11  
+#ifdef ICE_CPP11_COMPILER  
     cout << "testing alternate dictionaries with new C++11 AMI callbacks... " << flush;
     {
         {
@@ -3237,7 +3237,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         cb->check();
     }
     cout << "ok" << endl;
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     cout << "testing class mapped structs with C++11 AMI... " << flush;
     {
         CallbackPtr cb = new Callback();
@@ -3302,7 +3302,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
                              newInParam(wstr));
         cb->check();
     }
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     {
         CallbackPtr cb = new Callback();
         wsc1->begin_opString(wstr,
@@ -3341,7 +3341,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
                                                                             &Callback::noEx), newInParam(wstr));
         cb->check();
     }
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     {
         CallbackPtr cb = new Callback();
         wsc2->begin_opString(wstr,
@@ -3397,7 +3397,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         wsc1->begin_throwExcept(wstr, Ice::newCallback(cb, &Callback::throwExcept1), newInParam(wstr));
         cb->check();
     }
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     {
         CallbackPtr cb = new Callback();
         wsc1->begin_throwExcept(wstr, nullptr,
@@ -3435,7 +3435,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         wsc2->begin_throwExcept(wstr, Ice::newCallback(cb, &Callback::throwExcept2), newInParam(wstr));
         cb->check();
     }
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     {
         CallbackPtr cb = new Callback();
         wsc2->begin_throwExcept(wstr, nullptr,
diff --git a/cpp/test/Ice/custom/CustomMap.h b/cpp/test/Ice/custom/CustomMap.h
index ba097ce2d1e..863fcf5101d 100644
--- a/cpp/test/Ice/custom/CustomMap.h
+++ b/cpp/test/Ice/custom/CustomMap.h
@@ -12,7 +12,7 @@
 
 #include <IceUtil/Config.h>
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
 #   include <unordered_map>
 #else
 #   include <map>
@@ -21,7 +21,7 @@
 namespace Test
 {
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
 template<typename K, typename V>
 class CustomMap : public std::unordered_map<K, V>
 {
diff --git a/cpp/test/Ice/defaultServant/.depend.mak b/cpp/test/Ice/defaultServant/.depend.mak
index 24709959dce..aa867b02ebb 100755
--- a/cpp/test/Ice/defaultServant/.depend.mak
+++ b/cpp/test/Ice/defaultServant/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ TestI.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ TestI.obj: \
     "$(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" \
@@ -220,6 +223,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -228,6 +232,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -268,7 +273,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -282,6 +287,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -293,7 +299,6 @@ Client.obj: \
     "$(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" \
@@ -316,7 +321,6 @@ Client.obj: \
     "$(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" \
@@ -348,6 +352,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -356,6 +361,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -396,7 +402,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -410,6 +416,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -421,7 +428,6 @@ AllTests.obj: \
     "$(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" \
@@ -444,7 +450,6 @@ AllTests.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/defaultValue/.depend.mak b/cpp/test/Ice/defaultValue/.depend.mak
index 05055be438d..ec085a7c21b 100755
--- a/cpp/test/Ice/defaultValue/.depend.mak
+++ b/cpp/test/Ice/defaultValue/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -98,6 +100,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -106,6 +109,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -146,7 +150,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -160,6 +164,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -171,7 +176,6 @@ Client.obj: \
     "$(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" \
@@ -194,7 +198,6 @@ Client.obj: \
     "$(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" \
@@ -226,6 +229,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -234,6 +238,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -274,7 +279,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -288,6 +293,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -299,7 +305,6 @@ AllTests.obj: \
     "$(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" \
@@ -322,7 +327,6 @@ AllTests.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/dispatcher/.depend.mak b/cpp/test/Ice/dispatcher/.depend.mak
index 7a554e0119e..5f13f091b96 100755
--- a/cpp/test/Ice/dispatcher/.depend.mak
+++ b/cpp/test/Ice/dispatcher/.depend.mak
@@ -20,6 +20,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -28,6 +29,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -62,7 +64,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -71,6 +73,7 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -78,7 +81,6 @@ Test.obj: \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Endpoint.h" \
     "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -101,6 +103,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -109,6 +112,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -149,7 +153,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -163,6 +167,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -174,7 +179,6 @@ Client.obj: \
     "$(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" \
@@ -197,7 +201,6 @@ Client.obj: \
     "$(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" \
@@ -230,6 +233,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -238,6 +242,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -278,7 +283,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -292,6 +297,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -303,7 +309,6 @@ AllTests.obj: \
     "$(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" \
@@ -326,7 +331,6 @@ AllTests.obj: \
     "$(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" \
@@ -368,6 +372,7 @@ Dispatcher.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -376,6 +381,7 @@ Dispatcher.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -405,6 +411,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -413,6 +420,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -447,7 +455,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -456,6 +464,7 @@ TestI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -482,7 +491,6 @@ TestI.obj: \
     "$(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" \
@@ -504,7 +512,6 @@ TestI.obj: \
     "$(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" \
@@ -536,6 +543,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -544,6 +552,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -584,7 +593,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -598,6 +607,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -609,7 +619,6 @@ Server.obj: \
     "$(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" \
@@ -632,7 +641,6 @@ Server.obj: \
     "$(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" \
@@ -666,6 +674,7 @@ Collocated.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -674,6 +683,7 @@ Collocated.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -714,7 +724,7 @@ Collocated.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -728,6 +738,7 @@ Collocated.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -739,7 +750,6 @@ Collocated.obj: \
     "$(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" \
@@ -762,7 +772,6 @@ Collocated.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/dispatcher/AllTests.cpp b/cpp/test/Ice/dispatcher/AllTests.cpp
index aa6f8397739..5427ba0639b 100644
--- a/cpp/test/Ice/dispatcher/AllTests.cpp
+++ b/cpp/test/Ice/dispatcher/AllTests.cpp
@@ -116,7 +116,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
     Test::TestIntfControllerPrx testController = Test::TestIntfControllerPrx::uncheckedCast(obj);
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
     cout << "testing C++11 dispatcher... " << flush;
 #else
     cout << "testing dispatcher... " << flush;
diff --git a/cpp/test/Ice/dispatcher/Client.cpp b/cpp/test/Ice/dispatcher/Client.cpp
index 930fe5d4fe4..4292b7a3398 100644
--- a/cpp/test/Ice/dispatcher/Client.cpp
+++ b/cpp/test/Ice/dispatcher/Client.cpp
@@ -44,7 +44,7 @@ main(int argc, char* argv[])
         //
         initData.properties->setProperty("Ice.TCP.SndSize", "50000");
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
         Ice::DispatcherPtr dispatcher = new Dispatcher();
         initData.dispatcher = Ice::newDispatcher(
             [=](const Ice::DispatcherCallPtr& call, const Ice::ConnectionPtr& conn)
diff --git a/cpp/test/Ice/dispatcher/Collocated.cpp b/cpp/test/Ice/dispatcher/Collocated.cpp
index eea3f48adcf..34b5b235515 100644
--- a/cpp/test/Ice/dispatcher/Collocated.cpp
+++ b/cpp/test/Ice/dispatcher/Collocated.cpp
@@ -52,7 +52,7 @@ main(int argc, char* argv[])
     {
         Ice::InitializationData initData;
         initData.properties = Ice::createProperties(argc, argv);
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
         Ice::DispatcherPtr dispatcher = new Dispatcher();
         initData.dispatcher = Ice::newDispatcher(
             [=](const Ice::DispatcherCallPtr& call, const Ice::ConnectionPtr& conn)
diff --git a/cpp/test/Ice/dispatcher/Server.cpp b/cpp/test/Ice/dispatcher/Server.cpp
index e5ef74693ef..2f320a0f868 100644
--- a/cpp/test/Ice/dispatcher/Server.cpp
+++ b/cpp/test/Ice/dispatcher/Server.cpp
@@ -60,7 +60,7 @@ main(int argc, char* argv[])
         //
         initData.properties->setProperty("Ice.TCP.RcvSize", "50000");
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
         Ice::DispatcherPtr dispatcher = new Dispatcher();
         initData.dispatcher = Ice::newDispatcher(
             [=](const Ice::DispatcherCallPtr& call, const Ice::ConnectionPtr& conn)
diff --git a/cpp/test/Ice/echo/.depend.mak b/cpp/test/Ice/echo/.depend.mak
index 788529b791c..8d75489e052 100755
--- a/cpp/test/Ice/echo/.depend.mak
+++ b/cpp/test/Ice/echo/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ BlobjectI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ BlobjectI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ BlobjectI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ BlobjectI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ BlobjectI.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ BlobjectI.obj: \
     "$(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" \
@@ -219,6 +222,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -227,6 +231,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -267,7 +272,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -281,6 +286,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -292,7 +298,6 @@ Server.obj: \
     "$(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" \
@@ -315,7 +320,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/enums/.depend.mak b/cpp/test/Ice/enums/.depend.mak
index bc9acb90c91..40de27ede41 100755
--- a/cpp/test/Ice/enums/.depend.mak
+++ b/cpp/test/Ice/enums/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -224,6 +227,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -232,6 +236,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -272,7 +277,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -286,6 +291,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -297,7 +303,6 @@ AllTests.obj: \
     "$(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" \
@@ -320,7 +325,6 @@ AllTests.obj: \
     "$(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" \
@@ -352,6 +356,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -360,6 +365,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -400,7 +406,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -414,6 +420,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -425,7 +432,6 @@ TestI.obj: \
     "$(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" \
@@ -448,7 +454,6 @@ TestI.obj: \
     "$(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" \
@@ -476,6 +481,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -484,6 +490,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -524,7 +531,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -538,6 +545,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -549,7 +557,6 @@ Server.obj: \
     "$(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" \
@@ -572,7 +579,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/enums/AllTests.cpp b/cpp/test/Ice/enums/AllTests.cpp
index dafb05cb46b..bb531fb4019 100644
--- a/cpp/test/Ice/enums/AllTests.cpp
+++ b/cpp/test/Ice/enums/AllTests.cpp
@@ -15,60 +15,61 @@
 using namespace std;
 using namespace Test;
 
-TestIntfPrx
+TestIntfPrxPtr
 allTests(const Ice::CommunicatorPtr& communicator)
 {
     string ref = "test:default -p 12010";
-    Ice::ObjectPrx obj = communicator->stringToProxy(ref);
+    Ice::ObjectPrxPtr obj = communicator->stringToProxy(ref);
     test(obj);
-    TestIntfPrx proxy = TestIntfPrx::checkedCast(obj);
+    TestIntfPrxPtr proxy = ICE_CHECKED_CAST(TestIntfPrx, obj);
     test(proxy);
 
     cout << "testing enum values... " << flush;
 
-    test(static_cast<int>(benum1) == 0);
-    test(static_cast<int>(benum2) == 1);
-    test(static_cast<int>(benum3) == ByteConst1);
-    test(static_cast<int>(benum4) == ByteConst1 + 1);
-    test(static_cast<int>(benum5) == ShortConst1);
-    test(static_cast<int>(benum6) == ShortConst1 + 1);
-    test(static_cast<int>(benum7) == IntConst1);
-    test(static_cast<int>(benum8) == IntConst1 + 1);
-    test(static_cast<int>(benum9) == LongConst1);
-    test(static_cast<int>(benum10) == LongConst1 + 1);
-    test(static_cast<int>(benum11) == ByteConst2);
-
-    test(static_cast<int>(senum1) == 3);
-    test(static_cast<int>(senum2) == 4);
-    test(static_cast<int>(senum3) == ByteConst1);
-    test(static_cast<int>(senum4) == ByteConst1 + 1);
-    test(static_cast<int>(senum5) == ShortConst1);
-    test(static_cast<int>(senum6) == ShortConst1 + 1);
-    test(static_cast<int>(senum7) == IntConst1);
-    test(static_cast<int>(senum8) == IntConst1 + 1);
-    test(static_cast<int>(senum9) == LongConst1);
-    test(static_cast<int>(senum10) == LongConst1 + 1);
-    test(static_cast<int>(senum11) == ShortConst2);
-
-    test(static_cast<int>(ienum1) == 0);
-    test(static_cast<int>(ienum2) == 1);
-    test(static_cast<int>(ienum3) == ByteConst1);
-    test(static_cast<int>(ienum4) == ByteConst1 + 1);
-    test(static_cast<int>(ienum5) == ShortConst1);
-    test(static_cast<int>(ienum6) == ShortConst1 + 1);
-    test(static_cast<int>(ienum7) == IntConst1);
-    test(static_cast<int>(ienum8) == IntConst1 + 1);
-    test(static_cast<int>(ienum9) == LongConst1);
-    test(static_cast<int>(ienum10) == LongConst1 + 1);
-    test(static_cast<int>(ienum11) == IntConst2);
-    test(static_cast<int>(ienum12) == LongConst2);
-
-    test(static_cast<int>(red) == 0);
-    test(static_cast<int>(green) == 1);
-    test(static_cast<int>(blue) == 2);
+    test(static_cast<int>(ICE_ENUM(ByteEnum, benum1)) == 0);
+    test(static_cast<int>(ICE_ENUM(ByteEnum, benum2)) == 1);
+    test(static_cast<int>(ICE_ENUM(ByteEnum, benum3)) == ByteConst1);
+    test(static_cast<int>(ICE_ENUM(ByteEnum, benum4)) == ByteConst1 + 1);
+    test(static_cast<int>(ICE_ENUM(ByteEnum, benum5)) == ShortConst1);
+    test(static_cast<int>(ICE_ENUM(ByteEnum, benum6)) == ShortConst1 + 1);
+    test(static_cast<int>(ICE_ENUM(ByteEnum, benum7)) == IntConst1);
+    test(static_cast<int>(ICE_ENUM(ByteEnum, benum8)) == IntConst1 + 1);
+    test(static_cast<int>(ICE_ENUM(ByteEnum, benum9)) == LongConst1);
+    test(static_cast<int>(ICE_ENUM(ByteEnum, benum10)) == LongConst1 + 1);
+    test(static_cast<int>(ICE_ENUM(ByteEnum, benum11)) == ByteConst2);
+
+    test(static_cast<int>(ICE_ENUM(ShortEnum, senum1)) == 3);
+    test(static_cast<int>(ICE_ENUM(ShortEnum, senum2)) == 4);
+    test(static_cast<int>(ICE_ENUM(ShortEnum, senum3)) == ByteConst1);
+    test(static_cast<int>(ICE_ENUM(ShortEnum, senum4)) == ByteConst1 + 1);
+    test(static_cast<int>(ICE_ENUM(ShortEnum, senum5)) == ShortConst1);
+    test(static_cast<int>(ICE_ENUM(ShortEnum, senum6)) == ShortConst1 + 1);
+    test(static_cast<int>(ICE_ENUM(ShortEnum, senum7)) == IntConst1);
+    test(static_cast<int>(ICE_ENUM(ShortEnum, senum8)) == IntConst1 + 1);
+    test(static_cast<int>(ICE_ENUM(ShortEnum, senum9)) == LongConst1);
+    test(static_cast<int>(ICE_ENUM(ShortEnum, senum10)) == LongConst1 + 1);
+    test(static_cast<int>(ICE_ENUM(ShortEnum, senum11)) == ShortConst2);
+
+    test(static_cast<int>(ICE_ENUM(IntEnum, ienum1)) == 0);
+    test(static_cast<int>(ICE_ENUM(IntEnum, ienum2)) == 1);
+    test(static_cast<int>(ICE_ENUM(IntEnum, ienum3)) == ByteConst1);
+    test(static_cast<int>(ICE_ENUM(IntEnum, ienum4)) == ByteConst1 + 1);
+    test(static_cast<int>(ICE_ENUM(IntEnum, ienum5)) == ShortConst1);
+    test(static_cast<int>(ICE_ENUM(IntEnum, ienum6)) == ShortConst1 + 1);
+    test(static_cast<int>(ICE_ENUM(IntEnum, ienum7)) == IntConst1);
+    test(static_cast<int>(ICE_ENUM(IntEnum, ienum8)) == IntConst1 + 1);
+    test(static_cast<int>(ICE_ENUM(IntEnum, ienum9)) == LongConst1);
+    test(static_cast<int>(ICE_ENUM(IntEnum, ienum10)) == LongConst1 + 1);
+    test(static_cast<int>(ICE_ENUM(IntEnum, ienum11)) == IntConst2);
+    test(static_cast<int>(ICE_ENUM(IntEnum, ienum12)) == LongConst2);
+
+    test(static_cast<int>(ICE_ENUM(SimpleEnum, red)) == 0);
+    test(static_cast<int>(ICE_ENUM(SimpleEnum, green)) == 1);
+    test(static_cast<int>(ICE_ENUM(SimpleEnum, blue)) == 2);
 
     cout << "ok" << endl;
 
+#ifndef ICE_CPP11_MAPPING
     cout << "testing enum streaming... " << flush;
 
     Ice::OutputStreamPtr out;
@@ -77,59 +78,73 @@ allTests(const Ice::CommunicatorPtr& communicator)
     const bool encoding_1_0 = communicator->getProperties()->getProperty("Ice.Default.EncodingVersion") == "1.0";
 
     out = Ice::createOutputStream(communicator);
-    out->write(benum11);
+    out->write(ICE_ENUM(ByteEnum, benum11));
     out->finished(bytes);
     test(bytes.size() == 1); // ByteEnum should require one byte
 
     out = Ice::createOutputStream(communicator);
-    out->write(senum11);
+    out->write(ICE_ENUM(ShortEnum, senum11));
     out->finished(bytes);
     test(bytes.size() == (encoding_1_0 ? 2 : 5));
 
     out = Ice::createOutputStream(communicator);
-    out->write(ienum11);
+    out->write(ICE_ENUM(IntEnum, ienum11));
     out->finished(bytes);
     test(bytes.size() == (encoding_1_0 ? 4 : 5));
 
     out = Ice::createOutputStream(communicator);
-    out->write(blue);
+    out->write(ICE_ENUM(SimpleEnum, blue));
     out->finished(bytes);
     test(bytes.size() == 1); // SimpleEnum should require one byte
 
     cout << "ok" << endl;
+#endif
 
     cout << "testing enum operations... " << flush;
 
     ByteEnum byteEnum;
-    test(proxy->opByte(benum1, byteEnum) == benum1);
-    test(byteEnum == benum1);
-    test(proxy->opByte(benum11, byteEnum) == benum11);
-    test(byteEnum == benum11);
+    test(proxy->opByte(ICE_ENUM(ByteEnum, benum1), byteEnum) == ICE_ENUM(ByteEnum, benum1));
+    test(byteEnum == ICE_ENUM(ByteEnum, benum1));
+    test(proxy->opByte(ICE_ENUM(ByteEnum, benum11), byteEnum) == ICE_ENUM(ByteEnum, benum11));
+    test(byteEnum == ICE_ENUM(ByteEnum, benum11));
 
     ShortEnum shortEnum;
-    test(proxy->opShort(senum1, shortEnum) == senum1);
-    test(shortEnum == senum1);
-    test(proxy->opShort(senum11, shortEnum) == senum11);
-    test(shortEnum == senum11);
+    test(proxy->opShort(ICE_ENUM(ShortEnum, senum1), shortEnum) == ICE_ENUM(ShortEnum, senum1));
+    test(shortEnum == ICE_ENUM(ShortEnum, senum1));
+    test(proxy->opShort(ICE_ENUM(ShortEnum, senum11), shortEnum) == ICE_ENUM(ShortEnum, senum11));
+    test(shortEnum == ICE_ENUM(ShortEnum, senum11));
 
     IntEnum intEnum;
-    test(proxy->opInt(ienum1, intEnum) == ienum1);
-    test(intEnum == ienum1);
-    test(proxy->opInt(ienum11, intEnum) == ienum11);
-    test(intEnum == ienum11);
-    test(proxy->opInt(ienum12, intEnum) == ienum12);
-    test(intEnum == ienum12);
+    test(proxy->opInt(ICE_ENUM(IntEnum, ienum1), intEnum) == ICE_ENUM(IntEnum, ienum1));
+    test(intEnum == ICE_ENUM(IntEnum, ienum1));
+    test(proxy->opInt(ICE_ENUM(IntEnum, ienum11), intEnum) == ICE_ENUM(IntEnum, ienum11));
+    test(intEnum == ICE_ENUM(IntEnum, ienum11));
+    test(proxy->opInt(ICE_ENUM(IntEnum, ienum12), intEnum) == ICE_ENUM(IntEnum, ienum12));
+    test(intEnum == ICE_ENUM(IntEnum, ienum12));
 
     SimpleEnum s;
-    test(proxy->opSimple(green, s) == green);
-    test(s == green);
+    test(proxy->opSimple(ICE_ENUM(SimpleEnum, green), s) == ICE_ENUM(SimpleEnum, green));
+    test(s == ICE_ENUM(SimpleEnum, green));
 
     cout << "ok" << endl;
 
     cout << "testing enum sequences operations... " << flush;
 
     {
-        ByteEnum values[] = { benum1, benum2, benum3, benum4, benum5, benum6, benum7, benum8, benum9, benum10, benum11};
+        ByteEnum values[] =
+        {
+            ICE_ENUM(ByteEnum, benum1),
+            ICE_ENUM(ByteEnum, benum2),
+            ICE_ENUM(ByteEnum, benum3),
+            ICE_ENUM(ByteEnum, benum4),
+            ICE_ENUM(ByteEnum, benum5),
+            ICE_ENUM(ByteEnum, benum6),
+            ICE_ENUM(ByteEnum, benum7),
+            ICE_ENUM(ByteEnum, benum8),
+            ICE_ENUM(ByteEnum, benum9),
+            ICE_ENUM(ByteEnum, benum10),
+            ICE_ENUM(ByteEnum, benum11)
+        };
         ByteEnumSeq b1(&values[0], &values[0] + sizeof(values) / sizeof(ByteEnum));
 
         ByteEnumSeq b2;
@@ -143,7 +158,20 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
 
     {
-        ShortEnum values[] = { senum1, senum2, senum3, senum4, senum5, senum6, senum7, senum8, senum9, senum10, senum11};
+        ShortEnum values[] = 
+        {
+            ICE_ENUM(ShortEnum, senum1),
+            ICE_ENUM(ShortEnum, senum2),
+            ICE_ENUM(ShortEnum, senum3),
+            ICE_ENUM(ShortEnum, senum4),
+            ICE_ENUM(ShortEnum, senum5),
+            ICE_ENUM(ShortEnum, senum6),
+            ICE_ENUM(ShortEnum, senum7),
+            ICE_ENUM(ShortEnum, senum8),
+            ICE_ENUM(ShortEnum, senum9),
+            ICE_ENUM(ShortEnum, senum10),
+            ICE_ENUM(ShortEnum, senum11)
+        };
         ShortEnumSeq s1(&values[0], &values[0] + sizeof(values) / sizeof(ShortEnum));
 
         ShortEnumSeq s2;
@@ -157,7 +185,20 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
 
     {
-        IntEnum values[] = { ienum1, ienum2, ienum3, ienum4, ienum5, ienum6, ienum7, ienum8, ienum9, ienum10, ienum11};
+        IntEnum values[] =
+        {
+            ICE_ENUM(IntEnum, ienum1),
+            ICE_ENUM(IntEnum, ienum2),
+            ICE_ENUM(IntEnum, ienum3),
+            ICE_ENUM(IntEnum, ienum4),
+            ICE_ENUM(IntEnum, ienum5),
+            ICE_ENUM(IntEnum, ienum6),
+            ICE_ENUM(IntEnum, ienum7),
+            ICE_ENUM(IntEnum, ienum8),
+            ICE_ENUM(IntEnum, ienum9),
+            ICE_ENUM(IntEnum, ienum10),
+            ICE_ENUM(IntEnum, ienum11)
+        };
         IntEnumSeq i1(&values[0], &values[0] + sizeof(values) / sizeof(IntEnum));
 
         IntEnumSeq i2;
@@ -171,7 +212,12 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
 
     {
-        SimpleEnum values[] = { red, green, blue };
+        SimpleEnum values[] =
+        {
+            ICE_ENUM(SimpleEnum, red),
+            ICE_ENUM(SimpleEnum, green),
+            ICE_ENUM(SimpleEnum, blue)
+        };
         SimpleEnumSeq s1(&values[0], &values[0] + sizeof(values) / sizeof(SimpleEnum));
 
         SimpleEnumSeq s2;
diff --git a/cpp/test/Ice/enums/Client.cpp b/cpp/test/Ice/enums/Client.cpp
index f0a9a201dd6..408f6519364 100644
--- a/cpp/test/Ice/enums/Client.cpp
+++ b/cpp/test/Ice/enums/Client.cpp
@@ -19,8 +19,8 @@ using namespace Test;
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
-    TestIntfPrx allTests(const Ice::CommunicatorPtr&);
-    TestIntfPrx t = allTests(communicator);
+    TestIntfPrxPtr allTests(const Ice::CommunicatorPtr&);
+    TestIntfPrxPtr t = allTests(communicator);
     t->shutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/enums/Server.cpp b/cpp/test/Ice/enums/Server.cpp
index 046e9f232bb..9b06cae40ff 100644
--- a/cpp/test/Ice/enums/Server.cpp
+++ b/cpp/test/Ice/enums/Server.cpp
@@ -20,8 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    Ice::ObjectPtr obj = new TestIntfI;
-    adapter->add(obj, communicator->stringToIdentity("test"));
+    adapter->add(ICE_MAKE_SHARED(TestIntfI), communicator->stringToIdentity("test"));
 
     adapter->activate();
     TEST_READY
diff --git a/cpp/test/Ice/exceptions/.depend.mak b/cpp/test/Ice/exceptions/.depend.mak
index 0bbe33d23ea..4523ae2327e 100755
--- a/cpp/test/Ice/exceptions/.depend.mak
+++ b/cpp/test/Ice/exceptions/.depend.mak
@@ -21,6 +21,7 @@ ExceptionsI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -29,6 +30,7 @@ ExceptionsI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -63,7 +65,7 @@ ExceptionsI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -72,13 +74,13 @@ ExceptionsI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
 
 Test.obj: \
@@ -95,6 +97,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -103,6 +106,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -137,7 +141,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -146,13 +150,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -177,6 +181,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -185,6 +190,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -225,7 +231,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -239,6 +245,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -250,7 +257,6 @@ Client.obj: \
     "$(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" \
@@ -273,7 +279,6 @@ Client.obj: \
     "$(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" \
@@ -305,6 +310,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -313,6 +319,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -353,7 +360,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -367,6 +374,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -378,7 +386,6 @@ AllTests.obj: \
     "$(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" \
@@ -401,7 +408,6 @@ AllTests.obj: \
     "$(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" \
@@ -433,6 +439,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -441,6 +448,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -481,7 +489,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -495,6 +503,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -506,7 +515,6 @@ TestI.obj: \
     "$(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" \
@@ -529,7 +537,6 @@ TestI.obj: \
     "$(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" \
@@ -562,6 +569,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -570,6 +578,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -610,7 +619,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -624,6 +633,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -635,7 +645,6 @@ Server.obj: \
     "$(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" \
@@ -658,7 +667,6 @@ Server.obj: \
     "$(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" \
@@ -689,6 +697,7 @@ TestAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -697,6 +706,7 @@ TestAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -731,7 +741,7 @@ TestAMD.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -740,6 +750,7 @@ TestAMD.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -747,7 +758,6 @@ TestAMD.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -772,6 +782,7 @@ TestAMDI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -780,6 +791,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -820,7 +832,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -834,6 +846,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -845,7 +858,6 @@ TestAMDI.obj: \
     "$(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" \
@@ -868,7 +880,6 @@ TestAMDI.obj: \
     "$(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" \
@@ -901,6 +912,7 @@ ServerAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -909,6 +921,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -949,7 +962,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -963,6 +976,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -974,7 +988,6 @@ ServerAMD.obj: \
     "$(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" \
@@ -997,7 +1010,6 @@ ServerAMD.obj: \
     "$(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" \
@@ -1030,6 +1042,7 @@ Collocated.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1038,6 +1051,7 @@ Collocated.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1078,7 +1092,7 @@ Collocated.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1092,6 +1106,7 @@ Collocated.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1103,7 +1118,6 @@ Collocated.obj: \
     "$(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" \
@@ -1126,7 +1140,6 @@ Collocated.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/exceptions/AllTests.cpp b/cpp/test/Ice/exceptions/AllTests.cpp
index 75221df2c92..562fb63a935 100644
--- a/cpp/test/Ice/exceptions/AllTests.cpp
+++ b/cpp/test/Ice/exceptions/AllTests.cpp
@@ -14,7 +14,7 @@
 using namespace std;
 using namespace Test;
 
-namespace 
+namespace
 {
 const bool printException = false;
 }
@@ -28,9 +28,15 @@ class ServantLocatorI : virtual public Ice::ServantLocator
 {
 public:
 
+#ifdef ICE_CPP11_MAPPING
+    virtual shared_ptr<Ice::Object> locate(const Ice::Current&, shared_ptr<void>&) { return nullptr; }
+    virtual void finished(const Ice::Current&, const shared_ptr<Ice::Object>&, const shared_ptr<void>&) {}
+    virtual void deactivate(const string&) {}
+#else
     virtual Ice::ObjectPtr locate(const Ice::Current&, Ice::LocalObjectPtr&) { return 0; }
     virtual void finished(const Ice::Current&, const Ice::ObjectPtr&, const Ice::LocalObjectPtr&) {}
     virtual void deactivate(const string&) {}
+#endif
 };
 
 class ObjectFactoryI : virtual public Ice::ObjectFactory
@@ -394,7 +400,7 @@ endsWith(const string& s, const string& findme)
     return false;
 }
 
-ThrowerPrx
+ThrowerPrxPtr
 allTests(const Ice::CommunicatorPtr& communicator)
 {
     cout << "testing ice_print()/what()... " << flush;
@@ -449,10 +455,10 @@ allTests(const Ice::CommunicatorPtr& communicator)
             test(os.str() == "Test::E");
             test(ex.data == "E");
         }
-    
+
         //
         // Test custom ice_print
-        // 
+        //
         {
             F ex("F");
             ostringstream os;
@@ -498,7 +504,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
             // Expected
         }
 
-        string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ? 
+        string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ?
             "127.0.0.1" : "\"0:0:0:0:0:0:0:1\"";
         communicator->getProperties()->setProperty("TestAdapter0.Endpoints", "default -h " + host);
         first = communicator->createObjectAdapter("TestAdapter0");
@@ -540,11 +546,11 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
     cout << "testing servant registration exceptions... " << flush;
     {
-        string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ? 
+        string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ?
             "127.0.0.1" : "\"0:0:0:0:0:0:0:1\"";
         communicator->getProperties()->setProperty("TestAdapter1.Endpoints", "default -h " + host);
         Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter1");
-        Ice::ObjectPtr obj = new EmptyI;
+        Ice::ObjectPtr obj = ICE_MAKE_SHARED(EmptyI);
         adapter->add(obj, communicator->stringToIdentity("x"));
         try
         {
@@ -573,7 +579,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
                 printer << ex;
             }
         }
-        
+
         try
         {
             adapter->add(0, communicator->stringToIdentity("x"));
@@ -609,11 +615,11 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
     cout << "testing servant locator registrations exceptions... " << flush;
     {
-        string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ? 
+        string host = communicator->getProperties()->getPropertyAsIntWithDefault("Ice.IPv6", 0) == 0 ?
             "127.0.0.1" : "\"0:0:0:0:0:0:0:1\"";
         communicator->getProperties()->setProperty("TestAdapter2.Endpoints", "default -h " + host);
         Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter2");
-        Ice::ServantLocatorPtr loc = new ServantLocatorI;
+        Ice::ServantLocatorPtr loc = ICE_MAKE_SHARED(ServantLocatorI);
         adapter->addServantLocator(loc, "x");
         try
         {
@@ -630,6 +636,27 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
     cout << "testing object factory registration exception... " << flush;
     {
+#ifdef ICE_CPP11_MAPPING
+        communicator->addObjectFactory(
+            [](const std::string&)
+            {
+                return nullptr;
+            },
+            "x");
+        try
+        {
+            communicator->addObjectFactory(
+                [](const std::string&)
+                {
+                    return nullptr;
+                },
+                "x");
+            test(false);
+        }
+        catch(const Ice::AlreadyRegisteredException&)
+        {
+        }
+#else
         Ice::ObjectFactoryPtr of = new ObjectFactoryI;
         communicator->addObjectFactory(of, "x");
         try
@@ -640,19 +667,24 @@ allTests(const Ice::CommunicatorPtr& communicator)
         catch(const Ice::AlreadyRegisteredException&)
         {
         }
+#endif
     }
     cout << "ok" << endl;
 
     cout << "testing stringToProxy... " << flush;
     string ref = "thrower:default -p 12010";
-    Ice::ObjectPrx base = communicator->stringToProxy(ref);
+    Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
 
     cout << "testing checked cast... " << flush;
-    ThrowerPrx thrower = ThrowerPrx::checkedCast(base);
+    ThrowerPrxPtr thrower = ICE_CHECKED_CAST(ThrowerPrx, base);
     test(thrower);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(thrower, base));
+#else
     test(thrower == base);
+#endif
     cout << "ok" << endl;
 
     cout << "catching exact types... " << flush;
@@ -943,8 +975,8 @@ allTests(const Ice::CommunicatorPtr& communicator)
             cerr << ex << endl;
             test(false);
         }
-        
-        ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(communicator->stringToProxy("thrower:default -p 12011"));
+
+        ThrowerPrxPtr thrower2 = ICE_UNCHECKED_CAST(ThrowerPrx, communicator->stringToProxy("thrower:default -p 12011"));
         try
         {
             thrower2->throwMemoryLimitException(Ice::ByteSeq(2 * 1024 * 1024)); // 2MB (no limits)
@@ -952,7 +984,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         catch(const Ice::MemoryLimitException&)
         {
         }
-        ThrowerPrx thrower3 = ThrowerPrx::uncheckedCast(communicator->stringToProxy("thrower:default -p 12012"));
+        ThrowerPrxPtr thrower3 = ICE_UNCHECKED_CAST(ThrowerPrx, communicator->stringToProxy("thrower:default -p 12012"));
         try
         {
             thrower3->throwMemoryLimitException(Ice::ByteSeq(1024)); // 1KB limit
@@ -970,7 +1002,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     Ice::Identity id = communicator->stringToIdentity("does not exist");
     try
     {
-        ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower->ice_identity(id));
+        ThrowerPrxPtr thrower2 = ICE_UNCHECKED_CAST(ThrowerPrx, thrower->ice_identity(id));
         thrower2->throwAasA(1);
 //      thrower2->ice_ping();
         test(false);
@@ -990,7 +1022,11 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
     try
     {
-        ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower, "no such facet");
+#ifdef ICE_CPP11_MAPPING
+        ThrowerPrxPtr thrower2 = Ice::uncheckedCast<ThrowerPrx>(thrower, "no such facet");
+#else
+        ThrowerPrxPtr thrower2 = ThrowerPrx::uncheckedCast(thrower, "no such facet");
+#endif
         try
         {
             thrower2->ice_ping();
@@ -1012,7 +1048,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
     try
     {
-        WrongOperationPrx thrower2 = WrongOperationPrx::uncheckedCast(thrower);
+        WrongOperationPrxPtr thrower2 = ICE_UNCHECKED_CAST(WrongOperationPrx, thrower);
         thrower2->noSuchOperation();
         test(false);
     }
@@ -1102,62 +1138,219 @@ allTests(const Ice::CommunicatorPtr& communicator)
     cout << "ok" << endl;
 
     cout << "catching exact types with new AMI mapping... " << flush;
-
+#ifdef ICE_CPP11_MAPPING
+    {
+        auto f = thrower->throwAasA_async(1);
+        try
+        {
+            f.get();
+            test(false);
+        }
+        catch(const A& ex)
+        {
+            test(ex.aMem == 1);
+        }
+        catch(const Ice::Exception&)
+        {
+            test(false);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+    }
+    {
+        auto f = thrower->throwAorDasAorD_async(1);
+        try
+        {
+            f.get();
+            test(false);
+        }
+        catch(const A& ex)
+        {
+            test(ex.aMem == 1);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+    }
+    {
+        auto f = thrower->throwAorDasAorD_async(-1);
+        try
+        {
+            f.get();
+            test(false);
+        }
+        catch(const D& ex)
+        {
+            test(ex.dMem == -1);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+    }
+    {
+        auto f = thrower->throwBasB_async(1, 2);
+        try
+        {
+            f.get();
+            test(false);
+        }
+        catch(const B& ex)
+        {
+            test(ex.aMem == 1);
+            test(ex.bMem == 2);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+    }
+    {
+        auto f = thrower->throwCasC_async(1, 2, 3);
+        try
+        {
+            f.get();
+            test(false);
+        }
+        catch(const C& ex)
+        {
+            test(ex.aMem == 1);
+            test(ex.bMem == 2);
+            test(ex.cMem == 3);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+    }
+    {
+        auto f = thrower->throwModA_async(1, 2);
+        try
+        {
+            f.get();
+        }
+        catch(const A& ex)
+        {
+            test(ex.aMem == 1);
+        }
+        catch(const Ice::OperationNotExistException&)
+        {
+            //
+            // This operation is not supported in Java.
+            //
+        }
+        catch(...)
+        {
+            test(false);
+        }
+    }
+#else
     {
         CallbackPtr cb = new Callback;
-        Callback_Thrower_throwAasAPtr callback = 
+        Callback_Thrower_throwAasAPtr callback =
             newCallback_Thrower_throwAasA(cb, &Callback::response, &Callback::exception_AasA);
         thrower->begin_throwAasA(1, callback);
         cb->check();
     }
-
     {
         CallbackPtr cb = new Callback;
-        Callback_Thrower_throwAorDasAorDPtr callback = 
+        Callback_Thrower_throwAorDasAorDPtr callback =
             newCallback_Thrower_throwAorDasAorD(cb, &Callback::response, &Callback::exception_AorDasAorD);
         thrower->begin_throwAorDasAorD(1, callback);
         cb->check();
     }
-
     {
         CallbackPtr cb = new Callback;
-        Callback_Thrower_throwAorDasAorDPtr callback = 
+        Callback_Thrower_throwAorDasAorDPtr callback =
             newCallback_Thrower_throwAorDasAorD(cb, &Callback::response, &Callback::exception_AorDasAorD);
         thrower->begin_throwAorDasAorD(-1, callback);
         cb->check();
     }
-
     {
         CallbackPtr cb = new Callback;
-        Callback_Thrower_throwBasBPtr callback = 
+        Callback_Thrower_throwBasBPtr callback =
             newCallback_Thrower_throwBasB(cb, &Callback::response, &Callback::exception_BasB);
         thrower->begin_throwBasB(1, 2, callback);
         cb->check();
     }
-
     {
         CallbackPtr cb = new Callback;
-        Callback_Thrower_throwCasCPtr callback = 
+        Callback_Thrower_throwCasCPtr callback =
             newCallback_Thrower_throwCasC(cb, &Callback::response, &Callback::exception_CasC);
         thrower->begin_throwCasC(1, 2, 3, callback);
         cb->check();
     }
-
     {
         CallbackPtr cb = new Callback;
-        Callback_Thrower_throwModAPtr callback = 
+        Callback_Thrower_throwModAPtr callback =
             newCallback_Thrower_throwModA(cb, &Callback::response, &Callback::exception_ModA);
         thrower->begin_throwModA(1, 2, callback);
         cb->check();
     }
-
+#endif
     cout << "ok" << endl;
 
     cout << "catching derived types with new AMI mapping... " << flush;
+#ifdef ICE_CPP11_MAPPING
+    {
+        auto f = thrower->throwBasA_async(1, 2);
+        try
+        {
+            f.get();
+        }
+        catch(const B& ex)
+        {
+            test(ex.aMem == 1);
+            test(ex.bMem == 2);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+    }
 
     {
+        auto f = thrower->throwCasA_async(1, 2, 3);
+        try
+        {
+            f.get();
+        }
+        catch(const C& ex)
+        {
+            test(ex.aMem == 1);
+            test(ex.bMem == 2);
+            test(ex.cMem == 3);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+    }
+
+    {
+        auto f = thrower->throwCasB_async(1, 2, 3);
+        try
+        {
+            f.get();
+        }
+        catch(const C& ex)
+        {
+            test(ex.aMem == 1);
+            test(ex.bMem == 2);
+            test(ex.cMem == 3);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+    }
+#else
+    {
         CallbackPtr cb = new Callback;
-        Callback_Thrower_throwBasAPtr callback = 
+        Callback_Thrower_throwBasAPtr callback =
             newCallback_Thrower_throwBasA(cb, &Callback::response, &Callback::exception_BasA);
         thrower->begin_throwBasA(1, 2, callback);
         cb->check();
@@ -1165,7 +1358,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
     {
         CallbackPtr cb = new Callback;
-        Callback_Thrower_throwCasAPtr callback = 
+        Callback_Thrower_throwCasAPtr callback =
             newCallback_Thrower_throwCasA(cb, &Callback::response, &Callback::exception_CasA);
         thrower->begin_throwCasA(1, 2, 3, callback);
         cb->check();
@@ -1173,21 +1366,74 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
     {
         CallbackPtr cb = new Callback;
-        Callback_Thrower_throwCasBPtr callback = 
+        Callback_Thrower_throwCasBPtr callback =
             newCallback_Thrower_throwCasB(cb, &Callback::response, &Callback::exception_CasB);
         thrower->begin_throwCasB(1, 2, 3, callback);
         cb->check();
     }
-
+#endif
     cout << "ok" << endl;
 
     if(thrower->supportsUndeclaredExceptions())
     {
         cout << "catching unknown user exception with new AMI mapping... " << flush;
+#ifdef ICE_CPP11_MAPPING
+        {
+            auto f = thrower->throwUndeclaredA_async(1);
+            try
+            {
+                f.get();
+                test(false);
+            }
+            catch(const Ice::UnknownUserException&)
+            {
+            }
+            catch(const Ice::Exception& ex)
+            {
+                cout << ex << endl;
+                cout << ex.ice_stackTrace() << endl;
+                test(false);
+            }
+            catch(...)
+            {
+                test(false);
+            }
+        }
+
+        {
+            auto f = thrower->throwUndeclaredB_async(1, 2);
+            try
+            {
+                f.get();
+                test(false);
+            }
+            catch(const Ice::UnknownUserException&)
+            {
+            }
+            catch(...)
+            {
+                test(false);
+            }
+        }
 
         {
+            auto f = thrower->throwUndeclaredC_async(1, 2, 3);
+            try
+            {
+                f.get();
+            }
+            catch(const Ice::UnknownUserException&)
+            {
+            }
+            catch(...)
+            {
+                test(false);
+            }
+        }
+#else
+        {
             CallbackPtr cb = new Callback;
-            Callback_Thrower_throwUndeclaredAPtr callback = 
+            Callback_Thrower_throwUndeclaredAPtr callback =
                 newCallback_Thrower_throwUndeclaredA(cb, &Callback::response, &Callback::exception_UndeclaredA);
             thrower->begin_throwUndeclaredA(1, callback);
             cb->check();
@@ -1203,25 +1449,43 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
         {
             CallbackPtr cb = new Callback;
-            Callback_Thrower_throwUndeclaredCPtr callback = 
+            Callback_Thrower_throwUndeclaredCPtr callback =
                 newCallback_Thrower_throwUndeclaredC(cb, &Callback::response, &Callback::exception_UndeclaredC);
             thrower->begin_throwUndeclaredC(1, 2, 3, callback);
             cb->check();
         }
-
+#endif
         cout << "ok" << endl;
     }
 
     cout << "catching object not exist exception with new AMI mapping... " << flush;
 
     {
+#ifdef ICE_CPP11_MAPPING
+        id = communicator->stringToIdentity("does not exist");
+        shared_ptr<ThrowerPrx> thrower2 = Ice::uncheckedCast<ThrowerPrx>(thrower->ice_identity(id));
+        auto f = thrower2->throwAasA_async(1);
+        try
+        {
+            f.get();
+        }
+        catch(const Ice::ObjectNotExistException& ex)
+        {
+            test(ex.id == id);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#else
         id = communicator->stringToIdentity("does not exist");
         ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower->ice_identity(id));
         CallbackPtr cb = new Callback(communicator);
-        Callback_Thrower_throwAasAPtr callback = 
+        Callback_Thrower_throwAasAPtr callback =
             newCallback_Thrower_throwAasA(cb, &Callback::response, &Callback::exception_AasAObjectNotExist);
         thrower2->begin_throwAasA(1, callback);
         cb->check();
+#endif
     }
 
     cout << "ok" << endl;
@@ -1229,12 +1493,25 @@ allTests(const Ice::CommunicatorPtr& communicator)
     cout << "catching facet not exist exception with new AMI mapping... " << flush;
 
     {
+#ifdef ICE_CPP11_MAPPING
+        shared_ptr<ThrowerPrx> thrower2 = Ice::uncheckedCast<ThrowerPrx>(thrower, "no such facet");
+        auto f = thrower2->throwAasA_async(1);
+        try
+        {
+            f.get();
+        }
+        catch(const Ice::FacetNotExistException& ex)
+        {
+            test(ex.facet == "no such facet");
+        }
+#else
         ThrowerPrx thrower2 = ThrowerPrx::uncheckedCast(thrower, "no such facet");
         CallbackPtr cb = new Callback;
-        Callback_Thrower_throwAasAPtr callback = 
+        Callback_Thrower_throwAasAPtr callback =
             newCallback_Thrower_throwAasA(cb, &Callback::response, &Callback::exception_AasAFacetNotExist);
         thrower2->begin_throwAasA(1, callback);
         cb->check();
+#endif
     }
 
     cout << "ok" << endl;
@@ -1242,22 +1519,74 @@ allTests(const Ice::CommunicatorPtr& communicator)
     cout << "catching operation not exist exception with new AMI mapping... " << flush;
 
     {
+#ifdef ICE_CPP11_MAPPING
+        shared_ptr<WrongOperationPrx> thrower4 = Ice::uncheckedCast<WrongOperationPrx>(thrower);
+        auto f = thrower4->noSuchOperation_async();
+        try
+        {
+            f.get();
+        }
+        catch(const Ice::OperationNotExistException& ex)
+        {
+            test(ex.operation == "noSuchOperation");
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#else
         CallbackPtr cb = new Callback;
-        Callback_WrongOperation_noSuchOperationPtr callback = 
-            newCallback_WrongOperation_noSuchOperation(cb, &Callback::response, 
+        Callback_WrongOperation_noSuchOperationPtr callback =
+            newCallback_WrongOperation_noSuchOperation(cb, &Callback::response,
                                                        &Callback::exception_noSuchOperation);
         WrongOperationPrx thrower4 = WrongOperationPrx::uncheckedCast(thrower);
         thrower4->begin_noSuchOperation(callback);
         cb->check();
+#endif
     }
 
     cout << "ok" << endl;
 
     cout << "catching unknown local exception with new AMI mapping... " << flush;
+#ifdef ICE_CPP11_MAPPING
+    {
+        auto f = thrower->throwLocalException_async();
+        try
+        {
+            f.get();
+            test(false);
+        }
+        catch(const Ice::UnknownLocalException&)
+        {
+        }
+        catch(...)
+        {
+            test(false);
+        }
+    }
 
     {
+        auto f = thrower->throwLocalExceptionIdempotent_async();
+        try
+        {
+            f.get();
+            test(false);
+        }
+        catch(const Ice::UnknownLocalException&)
+        {
+        }
+        catch(const Ice::OperationNotExistException&)
+        {
+        }
+        catch(...)
+        {
+            test(false);
+        }
+    }
+#else
+    {
         CallbackPtr cb = new Callback;
-        Callback_Thrower_throwLocalExceptionPtr callback = 
+        Callback_Thrower_throwLocalExceptionPtr callback =
             newCallback_Thrower_throwLocalException(cb, &Callback::response, &Callback::exception_LocalException);
         thrower->begin_throwLocalException(callback);
         cb->check();
@@ -1265,23 +1594,40 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
     {
         CallbackPtr cb = new Callback;
-        Callback_Thrower_throwLocalExceptionIdempotentPtr callback = 
-            newCallback_Thrower_throwLocalExceptionIdempotent(cb, &Callback::response, 
+        Callback_Thrower_throwLocalExceptionIdempotentPtr callback =
+            newCallback_Thrower_throwLocalExceptionIdempotent(cb, &Callback::response,
                                                               &Callback::exception_LocalException);
         thrower->begin_throwLocalExceptionIdempotent(callback);
         cb->check();
     }
-
+#endif
     cout << "ok" << endl;
 
     cout << "catching unknown non-Ice exception with new AMI mapping... " << flush;
 
     {
+#ifdef ICE_CPP11_MAPPING
+        auto f = thrower->throwNonIceException_async();
+        try
+        {
+            f.get();
+            test(false);
+        }
+        catch(const Ice::UnknownException&)
+        {
+        }
+        catch(...)
+        {
+            test(false);
+        }
+
+#else
         CallbackPtr cb = new Callback;
-        Callback_Thrower_throwNonIceExceptionPtr callback = 
+        Callback_Thrower_throwNonIceExceptionPtr callback =
             newCallback_Thrower_throwNonIceException(cb, &Callback::response, &Callback::exception_NonIceException);
         thrower->begin_throwNonIceException(callback);
         cb->check();
+#endif
     }
 
     cout << "ok" << endl;
diff --git a/cpp/test/Ice/exceptions/Client.cpp b/cpp/test/Ice/exceptions/Client.cpp
index aa287561706..dd0dc524185 100644
--- a/cpp/test/Ice/exceptions/Client.cpp
+++ b/cpp/test/Ice/exceptions/Client.cpp
@@ -19,8 +19,8 @@ using namespace Test;
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
-    ThrowerPrx allTests(const Ice::CommunicatorPtr&);
-    ThrowerPrx thrower = allTests(communicator);
+    ThrowerPrxPtr allTests(const Ice::CommunicatorPtr&);
+    ThrowerPrxPtr thrower = allTests(communicator);
     thrower->shutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/exceptions/Collocated.cpp b/cpp/test/Ice/exceptions/Collocated.cpp
index 394d21a7a8a..a7b0f9d88ff 100644
--- a/cpp/test/Ice/exceptions/Collocated.cpp
+++ b/cpp/test/Ice/exceptions/Collocated.cpp
@@ -21,10 +21,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    Ice::ObjectPtr object = new ThrowerI();
+    Ice::ObjectPtr object = ICE_MAKE_SHARED(ThrowerI);
     adapter->add(object, communicator->stringToIdentity("thrower"));
 
-    ThrowerPrx allTests(const Ice::CommunicatorPtr&);
+    ThrowerPrxPtr allTests(const Ice::CommunicatorPtr&);
     allTests(communicator);
 
     return EXIT_SUCCESS;
diff --git a/cpp/test/Ice/exceptions/Server.cpp b/cpp/test/Ice/exceptions/Server.cpp
index 40d6d640055..5b956649eb7 100644
--- a/cpp/test/Ice/exceptions/Server.cpp
+++ b/cpp/test/Ice/exceptions/Server.cpp
@@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("TestAdapter2");
     Ice::ObjectAdapterPtr adapter3 = communicator->createObjectAdapter("TestAdapter3");
-    Ice::ObjectPtr object = new ThrowerI();
+    Ice::ObjectPtr object = ICE_MAKE_SHARED(ThrowerI);
     adapter->add(object, communicator->stringToIdentity("thrower"));
     adapter2->add(object, communicator->stringToIdentity("thrower"));
     adapter3->add(object, communicator->stringToIdentity("thrower"));
diff --git a/cpp/test/Ice/exceptions/ServerAMD.cpp b/cpp/test/Ice/exceptions/ServerAMD.cpp
index 0049294407f..4bcc7bc89cb 100644
--- a/cpp/test/Ice/exceptions/ServerAMD.cpp
+++ b/cpp/test/Ice/exceptions/ServerAMD.cpp
@@ -21,7 +21,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
     Ice::ObjectAdapterPtr adapter2 = communicator->createObjectAdapter("TestAdapter2");
     Ice::ObjectAdapterPtr adapter3 = communicator->createObjectAdapter("TestAdapter3");
-    Ice::ObjectPtr object = new ThrowerI();
+    Ice::ObjectPtr object = ICE_MAKE_SHARED(ThrowerI);
     adapter->add(object, communicator->stringToIdentity("thrower"));
     adapter2->add(object, communicator->stringToIdentity("thrower"));
     adapter3->add(object, communicator->stringToIdentity("thrower"));
diff --git a/cpp/test/Ice/exceptions/TestAMDI.cpp b/cpp/test/Ice/exceptions/TestAMDI.cpp
index b0af853f56b..46646fbc721 100644
--- a/cpp/test/Ice/exceptions/TestAMDI.cpp
+++ b/cpp/test/Ice/exceptions/TestAMDI.cpp
@@ -28,6 +28,395 @@ ThrowerI::ThrowerI()
 {
 }
 
+#ifdef ICE_CPP11_MAPPING
+void
+ThrowerI::shutdown_async(function<void ()> response,
+                         function<void (const exception_ptr&)>,
+                         const Ice::Current& current)
+{
+    current.adapter->getCommunicator()->shutdown();
+    response();
+}
+
+void
+ThrowerI::supportsUndeclaredExceptions_async(function<void (bool)> response,
+                                             function<void (const exception_ptr&)>,
+                                             const Ice::Current&)
+{
+    response(true);
+}
+
+void
+ThrowerI::supportsAssertException_async(function<void (bool)> response,
+                                        function<void (const exception_ptr&)>,
+                                        const Ice::Current&)
+{
+    response(false);
+}
+
+void
+ThrowerI::throwAasA_async(int a,
+                          function<void ()>,
+                          function<void (const exception_ptr&)> exception,
+                          const Ice::Current&)
+{
+    try
+    {
+        A ex;
+        ex.aMem = a;
+        throw ex;
+    }
+    catch(...)
+    {
+        exception(current_exception());
+    }
+}
+
+void
+ThrowerI::throwAorDasAorD_async(int a,
+                                function<void ()>,
+                                function<void (const exception_ptr&)> exception,
+                                const Ice::Current&)
+{
+    try
+    {
+        if(a > 0)
+        {
+            A ex;
+            ex.aMem = a;
+            throw ex;
+        }
+        else
+        {
+            D ex;
+            ex.dMem = a;
+            throw ex;
+        }
+    }
+    catch(...)
+    {
+        exception(current_exception());
+    }
+}
+
+void
+ThrowerI::throwBasA_async(int a, int b,
+                          function<void ()>,
+                          function<void (const exception_ptr&)> exception,
+                          const Ice::Current&)
+{
+    try
+    {
+        B ex;
+        ex.aMem = a;
+        ex.bMem = b;
+        throw ex;
+    }
+    catch(...)
+    {
+        exception(current_exception());
+    }
+}
+
+void
+ThrowerI::throwCasA_async(int a, int b, int c,
+                          function<void ()>,
+                          function<void (const exception_ptr&)> exception,
+                          const Ice::Current&)
+{
+    try
+    {
+        C ex;
+        ex.aMem = a;
+        ex.bMem = b;
+        ex.cMem = c;
+        throw ex;
+    }
+    catch(...)
+    {
+        exception(current_exception());
+    }
+}
+
+void
+ThrowerI::throwBasB_async(int a, int b,
+                          function<void ()>,
+                          function<void (const exception_ptr&)> exception,
+                          const Ice::Current&)
+{
+    try
+    {
+        B ex;
+        ex.aMem = a;
+        ex.bMem = b;
+        throw ex;
+    }
+    catch(...)
+    {
+        exception(current_exception());
+    }
+}
+
+void
+ThrowerI::throwCasB_async(int a, int b, int c,
+                          function<void ()>,
+                          function<void (const exception_ptr&)> exception,
+                          const Ice::Current&)
+{
+    try
+    {
+        C ex;
+        ex.aMem = a;
+        ex.bMem = b;
+        ex.cMem = c;
+        throw ex;
+    }
+    catch(...)
+    {
+        exception(current_exception());
+    }
+}
+
+void
+ThrowerI::throwCasC_async(int a, int b, int c,
+                          function<void ()>,
+                          function<void (const exception_ptr&)> exception,
+                          const Ice::Current&)
+{
+    try
+    {
+        C ex;
+        ex.aMem = a;
+        ex.bMem = b;
+        ex.cMem = c;
+        throw ex;
+    }
+    catch(...)
+    {
+        exception(current_exception());
+    }
+}
+
+void
+ThrowerI::throwModA_async(int a, int a2,
+                          function<void ()>,
+                          function<void (const exception_ptr&)> exception,
+                          const Ice::Current&)
+{
+    Mod::A ex;
+    ex.aMem = a;
+    ex.a2Mem = a2;
+    throw ex;
+}
+
+void
+ThrowerI::throwUndeclaredA_async(int a,
+                                 function<void ()>,
+                                 function<void (const exception_ptr&)> exception,
+                                  const Ice::Current&)
+{
+    try
+    {
+        A ex;
+        ex.aMem = a;
+        throw ex;
+    }
+    catch(...)
+    {
+        exception(current_exception());
+    }
+}
+
+void
+ThrowerI::throwUndeclaredB_async(int a, int b,
+                                 function<void ()>,
+                                 function<void (const exception_ptr&)>,
+                                 const Ice::Current&)
+{
+    B ex;
+    ex.aMem = a;
+    ex.bMem = b;
+    throw ex;
+}
+
+void
+ThrowerI::throwUndeclaredC_async(int a, int b, int c,
+                                 function<void ()>,
+                                 function<void (const exception_ptr&)> exception,
+                                 const Ice::Current&)
+{
+    try
+    {
+        C ex;
+        ex.aMem = a;
+        ex.bMem = b;
+        ex.cMem = c;
+        throw ex;
+    }
+    catch(...)
+    {
+        exception(current_exception());
+    }
+}
+
+void
+ThrowerI::throwLocalException_async(function<void ()>,
+                                    function<void (const exception_ptr&)> exception,
+                                    const Ice::Current&)
+{
+    try
+    {
+        throw Ice::TimeoutException(__FILE__, __LINE__);
+    }
+    catch(...)
+    {
+        exception(current_exception());
+    }
+}
+
+void
+ThrowerI::throwNonIceException_async(function<void ()>,
+                                     function<void (const exception_ptr&)> exception,
+                                     const Ice::Current&)
+{
+    try
+    {
+        throw int(12345);
+    }
+    catch(...)
+    {
+        exception(current_exception());
+    }
+}
+
+void
+ThrowerI::throwAssertException_async(function<void ()>,
+                                     function<void (const exception_ptr&)>,
+                                     const Ice::Current&)
+{
+    assert(false); // No supported in C++
+}
+
+void
+ThrowerI::throwMemoryLimitException_async(const Ice::ByteSeq&,
+                                          function<void (const Ice::ByteSeq&)> response,
+                                          function<void (const exception_ptr&)>,
+                                          const Ice::Current&)
+{
+    response(Ice::ByteSeq(1024 * 20)); // 20 KB.
+}
+
+void
+ThrowerI::throwLocalExceptionIdempotent_async(function<void ()>,
+                                              function<void (const exception_ptr&)> exception,
+                                              const Ice::Current&)
+{
+    try
+    {
+        throw Ice::TimeoutException(__FILE__, __LINE__);
+    }
+    catch(...)
+    {
+        exception(current_exception());
+    }
+    
+}
+
+void
+ThrowerI::throwAfterResponse_async(function<void ()> response,
+                                   function<void (const exception_ptr&)>,
+                                   const Ice::Current&)
+{
+    response();
+
+    throw std::string();
+}
+
+void
+ThrowerI::throwAfterException_async(function<void ()>,
+                                    function<void (const exception_ptr&)> exception,
+                                    const Ice::Current&)
+{
+    try
+    {
+        throw A(12345);
+    }
+    catch(...)
+    {
+        exception(current_exception());
+    }
+    throw std::string();
+}
+
+void
+ThrowerI::throwE_async(function<void ()>,
+                       function<void (const exception_ptr&)> exception,
+                       const Ice::Current&)
+{
+    try
+    {
+        throw E("E");
+    }
+    catch(...)
+    {
+        exception(current_exception());
+    }
+}
+
+void
+ThrowerI::throwF_async(function<void ()>,
+                       function<void (const exception_ptr&)> exception,
+                       const Ice::Current&)
+{
+    try
+    {
+        throw F("F");
+    }
+    catch(...)
+    {
+        exception(current_exception());
+    }
+}
+
+void
+ThrowerI::throwG_async(function<void ()>,
+                       function<void (const exception_ptr&)> exception,
+                       const Ice::Current&)
+{
+    try
+    {
+        throw G(__FILE__, __LINE__, "G");
+    }
+    catch(const G& ex)
+    {
+        ostringstream os;
+        ex.ice_print(os);
+        test(endsWith(os.str(), "Test::G"));
+        test(ex.data == "G");
+        exception(current_exception());
+    }
+}
+
+void
+ThrowerI::throwH_async(function<void ()>,
+                       function<void (const exception_ptr&)> exception,
+                       const Ice::Current&)
+{
+    try
+    {
+        throw H(__FILE__, __LINE__, "H");
+    }
+    catch(const H& ex)
+    {
+        ostringstream os;
+        ex.ice_print(os);
+        test(endsWith(os.str(), "Test::H data:'H'"));
+        test(ex.data == "H");
+        exception(current_exception());
+    }
+}
+#else
+
 void
 ThrowerI::shutdown_async(const AMD_Thrower_shutdownPtr& cb,
                          const Ice::Current& current)
@@ -271,3 +660,4 @@ ThrowerI::throwH_async(const Test::AMD_Thrower_throwHPtr& cb, const Ice::Current
         cb->ice_exception(ex);
     }
 }
+#endif
diff --git a/cpp/test/Ice/exceptions/TestAMDI.h b/cpp/test/Ice/exceptions/TestAMDI.h
index 9247d7abe10..bbc244e6d5a 100644
--- a/cpp/test/Ice/exceptions/TestAMDI.h
+++ b/cpp/test/Ice/exceptions/TestAMDI.h
@@ -21,6 +21,119 @@ public:
 
     ThrowerI();
 
+#ifdef ICE_CPP11_MAPPING
+    virtual void shutdown_async(std::function<void ()>,
+                                std::function<void (const std::exception_ptr&)>,
+                                const Ice::Current&);
+
+    virtual void supportsUndeclaredExceptions_async(std::function<void (bool)>,
+                                                    std::function<void (const std::exception_ptr&)>,
+                                                    const Ice::Current&);
+
+    virtual void supportsAssertException_async(std::function<void (bool)>,
+                                               std::function<void (const std::exception_ptr&)>,
+                                               const Ice::Current&);
+
+    virtual void throwAasA_async(int,
+                                 std::function<void ()>,
+                                 std::function<void (const std::exception_ptr&)>,
+                                 const Ice::Current&);
+
+    virtual void throwAorDasAorD_async(int,
+                                       std::function<void ()>,
+                                       std::function<void (const std::exception_ptr&)>,
+                                       const Ice::Current&);
+
+    virtual void throwBasA_async(int, int,
+                                 std::function<void ()>,
+                                 std::function<void (const std::exception_ptr&)>,
+                                 const Ice::Current&);
+
+    virtual void throwCasA_async(int, int, int,
+                                 std::function<void ()>,
+                                 std::function<void (const std::exception_ptr&)>,
+                                 const Ice::Current&);
+
+    virtual void throwBasB_async(int, int,
+                                 std::function<void ()>,
+                                 std::function<void (const std::exception_ptr&)>,
+                                 const Ice::Current&);
+
+    virtual void throwCasB_async(int, int, int,
+                                 std::function<void ()>,
+                                 std::function<void (const std::exception_ptr&)>,
+                                 const Ice::Current&);
+
+    virtual void throwCasC_async(int, int, int,
+                                 std::function<void ()>,
+                                 std::function<void (const std::exception_ptr&)>,
+                                 const Ice::Current&);
+
+    virtual void throwModA_async(int, int,
+                                 std::function<void ()>,
+                                 std::function<void (const std::exception_ptr&)>,
+                                 const Ice::Current&);
+
+    virtual void throwUndeclaredA_async(int,
+                                        std::function<void ()>,
+                                        std::function<void (const std::exception_ptr&)>,
+                                        const Ice::Current&);
+
+    virtual void throwUndeclaredB_async(int, int,
+                                        std::function<void ()>,
+                                        std::function<void (const std::exception_ptr&)>,
+                                        const Ice::Current&);
+
+    virtual void throwUndeclaredC_async(int, int, int,
+                                        std::function<void ()>,
+                                        std::function<void (const std::exception_ptr&)>,
+                                        const Ice::Current&);
+
+    virtual void throwLocalException_async(std::function<void ()>,
+                                           std::function<void (const std::exception_ptr&)>,
+                                           const Ice::Current&);
+
+    virtual void throwNonIceException_async(std::function<void ()>,
+                                            std::function<void (const std::exception_ptr&)>,
+                                            const Ice::Current&);
+
+    virtual void throwAssertException_async(std::function<void ()>,
+                                            std::function<void (const std::exception_ptr&)>,
+                                            const Ice::Current&);
+
+    virtual void throwMemoryLimitException_async(const Ice::ByteSeq&,
+                                                 std::function<void (const Ice::ByteSeq&)>,
+                                                 std::function<void (const std::exception_ptr&)>,
+                                                 const Ice::Current&);
+
+    virtual void throwLocalExceptionIdempotent_async(std::function<void ()>,
+                                                     std::function<void (const std::exception_ptr&)>,
+                                                     const Ice::Current&);
+
+    virtual void throwAfterResponse_async(std::function<void ()>,
+                                          std::function<void (const std::exception_ptr&)>,
+                                          const Ice::Current&);
+
+    virtual void throwAfterException_async(std::function<void ()>,
+                                           std::function<void (const std::exception_ptr&)>,
+                                           const Ice::Current&);
+    
+    virtual void throwE_async(std::function<void ()>,
+                              std::function<void (const std::exception_ptr&)>,
+                              const Ice::Current&);
+
+    virtual void throwF_async(std::function<void ()>,
+                              std::function<void (const std::exception_ptr&)>,
+                              const Ice::Current&);
+
+    virtual void throwG_async(std::function<void ()>,
+                              std::function<void (const std::exception_ptr&)>,
+                              const Ice::Current&);
+
+    virtual void throwH_async(std::function<void ()>,
+                              std::function<void (const std::exception_ptr&)>,
+                              const Ice::Current&);
+#else
     virtual void shutdown_async(const Test::AMD_Thrower_shutdownPtr&,
                                 const Ice::Current&);
     virtual void supportsUndeclaredExceptions_async(const Test::AMD_Thrower_supportsUndeclaredExceptionsPtr&,
@@ -71,6 +184,7 @@ public:
     virtual void throwF_async(const Test::AMD_Thrower_throwFPtr&, const Ice::Current&);
     virtual void throwG_async(const Test::AMD_Thrower_throwGPtr&, const Ice::Current&);
     virtual void throwH_async(const Test::AMD_Thrower_throwHPtr&, const Ice::Current&);
+#endif
 };
 
 #endif
diff --git a/cpp/test/Ice/facets/.depend.mak b/cpp/test/Ice/facets/.depend.mak
index ceff27f3ac2..bf715fbacf8 100755
--- a/cpp/test/Ice/facets/.depend.mak
+++ b/cpp/test/Ice/facets/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -224,6 +227,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -232,6 +236,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -272,7 +277,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -286,6 +291,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -297,7 +303,6 @@ AllTests.obj: \
     "$(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" \
@@ -320,7 +325,6 @@ AllTests.obj: \
     "$(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" \
@@ -352,6 +356,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -360,6 +365,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -400,7 +406,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -414,6 +420,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -425,7 +432,6 @@ TestI.obj: \
     "$(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" \
@@ -448,7 +454,6 @@ TestI.obj: \
     "$(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" \
@@ -476,6 +481,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -484,6 +490,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -524,7 +531,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -538,6 +545,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -549,7 +557,6 @@ Server.obj: \
     "$(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" \
@@ -572,7 +579,6 @@ Server.obj: \
     "$(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" \
@@ -605,6 +611,7 @@ Collocated.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -613,6 +620,7 @@ Collocated.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -653,7 +661,7 @@ Collocated.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -667,6 +675,7 @@ Collocated.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -678,7 +687,6 @@ Collocated.obj: \
     "$(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" \
@@ -701,7 +709,6 @@ Collocated.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/faultTolerance/.depend.mak b/cpp/test/Ice/faultTolerance/.depend.mak
index 623670c29e2..7fb800b42f0 100755
--- a/cpp/test/Ice/faultTolerance/.depend.mak
+++ b/cpp/test/Ice/faultTolerance/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -224,6 +227,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -232,6 +236,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -272,7 +277,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -286,6 +291,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -297,7 +303,6 @@ AllTests.obj: \
     "$(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" \
@@ -320,7 +325,6 @@ AllTests.obj: \
     "$(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" \
@@ -352,6 +356,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -360,6 +365,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -400,7 +406,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -414,6 +420,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -425,7 +432,6 @@ TestI.obj: \
     "$(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" \
@@ -448,7 +454,6 @@ TestI.obj: \
     "$(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" \
@@ -476,6 +481,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -484,6 +490,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -524,7 +531,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -538,6 +545,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -549,7 +557,6 @@ Server.obj: \
     "$(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" \
@@ -572,7 +579,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/gc/.depend.mak b/cpp/test/Ice/gc/.depend.mak
index 400bae8da2f..e9a93d9a3b7 100755
--- a/cpp/test/Ice/gc/.depend.mak
+++ b/cpp/test/Ice/gc/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -106,6 +108,7 @@ Client.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -114,6 +117,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -148,7 +152,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -161,6 +165,7 @@ Client.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -172,7 +177,6 @@ Client.obj: \
     "$(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" \
@@ -195,7 +199,6 @@ Client.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/hash/.depend.mak b/cpp/test/Ice/hash/.depend.mak
index 16250fd0f9b..19071fcf13f 100755
--- a/cpp/test/Ice/hash/.depend.mak
+++ b/cpp/test/Ice/hash/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -98,6 +100,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -106,6 +109,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -146,7 +150,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -160,6 +164,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -171,7 +176,6 @@ Client.obj: \
     "$(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" \
@@ -194,7 +198,6 @@ Client.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/hold/.depend.mak b/cpp/test/Ice/hold/.depend.mak
index b5cc13a034d..f10f0c6f4b1 100755
--- a/cpp/test/Ice/hold/.depend.mak
+++ b/cpp/test/Ice/hold/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -224,6 +227,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -232,6 +236,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -272,7 +277,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -286,6 +291,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -297,7 +303,6 @@ AllTests.obj: \
     "$(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" \
@@ -320,7 +325,6 @@ AllTests.obj: \
     "$(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" \
@@ -353,6 +357,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -361,6 +366,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -401,7 +407,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -415,6 +421,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -426,7 +433,6 @@ TestI.obj: \
     "$(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" \
@@ -449,7 +455,6 @@ TestI.obj: \
     "$(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" \
@@ -482,6 +487,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -490,6 +496,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -530,7 +537,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -544,6 +551,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -555,7 +563,6 @@ Server.obj: \
     "$(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" \
@@ -578,7 +585,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/info/.depend.mak b/cpp/test/Ice/info/.depend.mak
index d27c1ffb66c..09facf2b454 100755
--- a/cpp/test/Ice/info/.depend.mak
+++ b/cpp/test/Ice/info/.depend.mak
@@ -21,6 +21,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -29,6 +30,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -63,7 +65,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -72,13 +74,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -101,6 +103,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -109,6 +112,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -149,7 +153,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -163,6 +167,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -174,7 +179,6 @@ TestI.obj: \
     "$(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" \
@@ -197,7 +201,6 @@ TestI.obj: \
     "$(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" \
@@ -235,6 +238,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -243,6 +247,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -283,7 +288,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -297,6 +302,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -308,7 +314,6 @@ Client.obj: \
     "$(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" \
@@ -331,7 +336,6 @@ Client.obj: \
     "$(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" \
@@ -363,6 +367,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -371,6 +376,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -411,7 +417,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -425,6 +431,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -436,7 +443,6 @@ AllTests.obj: \
     "$(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" \
@@ -459,7 +465,6 @@ AllTests.obj: \
     "$(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" \
@@ -497,6 +502,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -505,6 +511,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -545,7 +552,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -559,6 +566,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -570,7 +578,6 @@ Server.obj: \
     "$(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" \
@@ -593,7 +600,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/info/AllTests.cpp b/cpp/test/Ice/info/AllTests.cpp
index e07414e7816..cb2678bd4d5 100644
--- a/cpp/test/Ice/info/AllTests.cpp
+++ b/cpp/test/Ice/info/AllTests.cpp
@@ -20,14 +20,14 @@ allTests(const Ice::CommunicatorPtr& communicator)
 {
     cout << "testing proxy endpoint information... " << flush;
     {
-        Ice::ObjectPrx p1 =
+        Ice::ObjectPrxPtr p1 =
             communicator->stringToProxy("test -t:default -h tcphost -p 10000 -t 1200 -z --sourceAddress 10.10.10.10:"
                                         "udp -h udphost -p 10001 --interface eth0 --ttl 5 --sourceAddress 10.10.10.10:"
                                         "opaque -e 1.8 -t 100 -v ABCD");
 
         Ice::EndpointSeq endps = p1->ice_getEndpoints();
 
-        Ice::IPEndpointInfoPtr ipEndpoint = Ice::IPEndpointInfoPtr::dynamicCast(endps[0]->getInfo());
+        Ice::IPEndpointInfoPtr ipEndpoint = ICE_DYNAMIC_CAST(Ice::IPEndpointInfo, endps[0]->getInfo());
         test(ipEndpoint);
         test(ipEndpoint->host == "tcphost");
         test(ipEndpoint->port == 10000);
@@ -41,12 +41,12 @@ allTests(const Ice::CommunicatorPtr& communicator)
              (ipEndpoint->type() == IceSSL::EndpointType && ipEndpoint->secure()) ||
              (ipEndpoint->type() == Ice::WSEndpointType && !ipEndpoint->secure()) ||
              (ipEndpoint->type() == Ice::WSSEndpointType && ipEndpoint->secure()));
-        test((ipEndpoint->type() == Ice::TCPEndpointType && Ice::TCPEndpointInfoPtr::dynamicCast(ipEndpoint)) ||
-             (ipEndpoint->type() == IceSSL::EndpointType && IceSSL::EndpointInfoPtr::dynamicCast(ipEndpoint)) ||
-             (ipEndpoint->type() == Ice::WSEndpointType && Ice::WSEndpointInfoPtr::dynamicCast(ipEndpoint)) ||
-             (ipEndpoint->type() == Ice::WSSEndpointType && IceSSL::WSSEndpointInfoPtr::dynamicCast(ipEndpoint)));
+        test((ipEndpoint->type() == Ice::TCPEndpointType && ICE_DYNAMIC_CAST(Ice::TCPEndpointInfo, ipEndpoint)) ||
+             (ipEndpoint->type() == IceSSL::EndpointType && ICE_DYNAMIC_CAST(IceSSL::EndpointInfo, ipEndpoint)) ||
+             (ipEndpoint->type() == Ice::WSEndpointType && ICE_DYNAMIC_CAST(Ice::WSEndpointInfo, ipEndpoint)) ||
+             (ipEndpoint->type() == Ice::WSSEndpointType && ICE_DYNAMIC_CAST(IceSSL::WSSEndpointInfo, ipEndpoint)));
 
-        Ice::UDPEndpointInfoPtr udpEndpoint = Ice::UDPEndpointInfoPtr::dynamicCast(endps[1]->getInfo());
+        Ice::UDPEndpointInfoPtr udpEndpoint = ICE_DYNAMIC_CAST(Ice::UDPEndpointInfo, endps[1]->getInfo());
         test(udpEndpoint);
         test(udpEndpoint->host == "udphost");
         test(udpEndpoint->port == 10001);
@@ -61,7 +61,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         test(udpEndpoint->datagram());
         test(udpEndpoint->type() == Ice::UDPEndpointType);
 
-        Ice::OpaqueEndpointInfoPtr opaqueEndpoint = Ice::OpaqueEndpointInfoPtr::dynamicCast(endps[2]->getInfo());
+        Ice::OpaqueEndpointInfoPtr opaqueEndpoint = ICE_DYNAMIC_CAST(Ice::OpaqueEndpointInfo, endps[2]->getInfo());
         test(opaqueEndpoint);
         Ice::EncodingVersion rev;
         rev.major = 1;
@@ -81,7 +81,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         Ice::EndpointSeq publishedEndpoints = adapter->getPublishedEndpoints();
         test(endpoints == publishedEndpoints);
 
-        Ice::IPEndpointInfoPtr ipEndpoint = Ice::IPEndpointInfoPtr::dynamicCast(endpoints[0]->getInfo());
+        Ice::IPEndpointInfoPtr ipEndpoint = ICE_DYNAMIC_CAST(Ice::IPEndpointInfo, endpoints[0]->getInfo());
         test(ipEndpoint);
         test(ipEndpoint->type() == Ice::TCPEndpointType || ipEndpoint->type() == IceSSL::EndpointType ||
              ipEndpoint->type() == Ice::WSEndpointType || ipEndpoint->type() == Ice::WSSEndpointType);
@@ -89,7 +89,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         test(ipEndpoint->port > 0);
         test(ipEndpoint->timeout == 15000);
 
-        Ice::UDPEndpointInfoPtr udpEndpoint = Ice::UDPEndpointInfoPtr::dynamicCast(endpoints[1]->getInfo());
+        Ice::UDPEndpointInfoPtr udpEndpoint = ICE_DYNAMIC_CAST(Ice::UDPEndpointInfo, endpoints[1]->getInfo());
         test(udpEndpoint);
         test(udpEndpoint->host == "127.0.0.1");
         test(udpEndpoint->datagram());
@@ -108,11 +108,11 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
         for(Ice::EndpointSeq::const_iterator p = endpoints.begin(); p != endpoints.end(); ++p)
         {
-            ipEndpoint = Ice::IPEndpointInfoPtr::dynamicCast((*p)->getInfo());
+            ipEndpoint = ICE_DYNAMIC_CAST(Ice::IPEndpointInfo, (*p)->getInfo());
             test(ipEndpoint->port == 12020);
         }
 
-        ipEndpoint = Ice::IPEndpointInfoPtr::dynamicCast(publishedEndpoints[0]->getInfo());
+        ipEndpoint = ICE_DYNAMIC_CAST(Ice::IPEndpointInfo, publishedEndpoints[0]->getInfo());
         test(ipEndpoint->host == "127.0.0.1");
         test(ipEndpoint->port == 12020);
 
@@ -120,13 +120,13 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
     cout << "ok" << endl;
 
-    Ice::ObjectPrx base = communicator->stringToProxy("test:default -p 12010:udp -p 12010 -c");
-    TestIntfPrx testIntf = TestIntfPrx::checkedCast(base);
+    Ice::ObjectPrxPtr base = communicator->stringToProxy("test:default -p 12010:udp -p 12010 -c");
+    TestIntfPrxPtr testIntf = ICE_CHECKED_CAST(TestIntfPrx, base);
 
     cout << "test connection endpoint information... " << flush;
     {
         Ice::EndpointInfoPtr info = base->ice_getConnection()->getEndpoint()->getInfo();
-        Ice::IPEndpointInfoPtr ipinfo = Ice::IPEndpointInfoPtr::dynamicCast(info);
+        Ice::IPEndpointInfoPtr ipinfo = ICE_DYNAMIC_CAST(Ice::IPEndpointInfo, info);
         test(ipinfo->port == 12010);
         test(!ipinfo->compress);
         test(ipinfo->host == defaultHost);
@@ -142,7 +142,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         test(port > 0);
 
         info = base->ice_datagram()->ice_getConnection()->getEndpoint()->getInfo();
-        Ice::UDPEndpointInfoPtr udp = Ice::UDPEndpointInfoPtr::dynamicCast(info);
+        Ice::UDPEndpointInfoPtr udp = ICE_DYNAMIC_CAST(Ice::UDPEndpointInfo, info);
         test(udp);
         test(udp->port == 12010);
         test(udp->host == defaultHost);
@@ -154,7 +154,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         Ice::ConnectionPtr connection = base->ice_getConnection();
         connection->setBufferSize(1024, 2048);
 
-        Ice::IPConnectionInfoPtr info = Ice::IPConnectionInfoPtr::dynamicCast(connection->getInfo());
+        Ice::IPConnectionInfoPtr info = ICE_DYNAMIC_CAST(Ice::IPConnectionInfo, connection->getInfo());
         test(info);
         test(!info->incoming);
         test(info->adapterName.empty());
@@ -188,13 +188,13 @@ allTests(const Ice::CommunicatorPtr& communicator)
         {
             Ice::HeaderDict headers;
 
-            Ice::WSConnectionInfoPtr wsinfo = Ice::WSConnectionInfoPtr::dynamicCast(info);
+            Ice::WSConnectionInfoPtr wsinfo = ICE_DYNAMIC_CAST(Ice::WSConnectionInfo, info);
             if(wsinfo)
             {
                 headers = wsinfo->headers;
             }
 
-            IceSSL::WSSConnectionInfoPtr wssinfo = IceSSL::WSSConnectionInfoPtr::dynamicCast(info);
+            IceSSL::WSSConnectionInfoPtr wssinfo = ICE_DYNAMIC_CAST(IceSSL::WSSConnectionInfo, info);
             if(wssinfo)
             {
                 headers = wssinfo->headers;
@@ -219,7 +219,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         connection = base->ice_datagram()->ice_getConnection();
         connection->setBufferSize(2048, 1024);
 
-        info = Ice::IPConnectionInfoPtr::dynamicCast(connection->getInfo());
+        info = ICE_DYNAMIC_CAST(Ice::IPConnectionInfo, connection->getInfo());
         test(!info->incoming);
         test(info->adapterName.empty());
         test(info->localPort > 0);
diff --git a/cpp/test/Ice/info/Server.cpp b/cpp/test/Ice/info/Server.cpp
index 50c861627a8..b58aa06935d 100644
--- a/cpp/test/Ice/info/Server.cpp
+++ b/cpp/test/Ice/info/Server.cpp
@@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    adapter->add(new TestI, communicator->stringToIdentity("test"));
+    adapter->add(ICE_MAKE_SHARED(TestI), communicator->stringToIdentity("test"));
     adapter->activate();
     TEST_READY
     communicator->waitForShutdown();
diff --git a/cpp/test/Ice/info/TestI.cpp b/cpp/test/Ice/info/TestI.cpp
index 11588b29294..735c098c5b9 100644
--- a/cpp/test/Ice/info/TestI.cpp
+++ b/cpp/test/Ice/info/TestI.cpp
@@ -38,16 +38,16 @@ TestI::getEndpointInfoAsContext(const Ice::Current& c)
     os << info->type();
     ctx["type"] = os.str();
 
-    Ice::IPEndpointInfoPtr ipinfo = Ice::IPEndpointInfoPtr::dynamicCast(info);
+    Ice::IPEndpointInfoPtr ipinfo = ICE_DYNAMIC_CAST(Ice::IPEndpointInfo, info);
     test(info);
     ctx["host"] = ipinfo->host;
     os.str("");
     os << ipinfo->port;
     ctx["port"] = os.str();
 
-    if(Ice::UDPEndpointInfoPtr::dynamicCast(ipinfo))
+    if(ICE_DYNAMIC_CAST(Ice::UDPEndpointInfo, ipinfo))
     {
-        Ice::UDPEndpointInfoPtr udp = Ice::UDPEndpointInfoPtr::dynamicCast(ipinfo);
+        Ice::UDPEndpointInfoPtr udp = ICE_DYNAMIC_CAST(Ice::UDPEndpointInfo, ipinfo);
         ctx["mcastInterface"] = udp->mcastInterface;
         ctx["mcastTtl"] = udp->mcastTtl;
     }
@@ -64,7 +64,7 @@ TestI::getConnectionInfoAsContext(const Ice::Current& c)
     ctx["incoming"] = info->incoming ? "true" : "false";
     ostringstream os;
 
-    Ice::IPConnectionInfoPtr ipinfo = Ice::IPConnectionInfoPtr::dynamicCast(info);
+    Ice::IPConnectionInfoPtr ipinfo = ICE_DYNAMIC_CAST(Ice::IPConnectionInfo, info);
     test(ipinfo);
     ctx["localAddress"] = ipinfo->localAddress;
     os.str("");
@@ -75,7 +75,7 @@ TestI::getConnectionInfoAsContext(const Ice::Current& c)
     os << ipinfo->remotePort;
     ctx["remotePort"] = os.str();
 
-    Ice::WSConnectionInfoPtr wsinfo = Ice::WSConnectionInfoPtr::dynamicCast(info);
+    Ice::WSConnectionInfoPtr wsinfo = ICE_DYNAMIC_CAST(Ice::WSConnectionInfo, info);
     if(wsinfo)
     {
         for(Ice::HeaderDict::const_iterator p = wsinfo->headers.begin(); p != wsinfo->headers.end(); ++p)
@@ -84,7 +84,7 @@ TestI::getConnectionInfoAsContext(const Ice::Current& c)
         }
     }
 
-    IceSSL::WSSConnectionInfoPtr wssinfo = IceSSL::WSSConnectionInfoPtr::dynamicCast(info);
+    IceSSL::WSSConnectionInfoPtr wssinfo = ICE_DYNAMIC_CAST(IceSSL::WSSConnectionInfo, info);
     if(wssinfo)
     {
         for(Ice::HeaderDict::const_iterator p = wssinfo->headers.begin(); p != wssinfo->headers.end(); ++p)
diff --git a/cpp/test/Ice/inheritance/.depend.mak b/cpp/test/Ice/inheritance/.depend.mak
index d142abc4ef8..640ed696dcf 100755
--- a/cpp/test/Ice/inheritance/.depend.mak
+++ b/cpp/test/Ice/inheritance/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -98,6 +100,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -106,6 +109,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -146,7 +150,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -160,6 +164,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -171,7 +176,6 @@ Client.obj: \
     "$(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" \
@@ -194,7 +198,6 @@ Client.obj: \
     "$(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" \
@@ -226,6 +229,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -234,6 +238,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -274,7 +279,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -288,6 +293,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -299,7 +305,6 @@ AllTests.obj: \
     "$(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" \
@@ -322,7 +327,6 @@ AllTests.obj: \
     "$(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" \
@@ -354,6 +358,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -362,6 +367,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -402,7 +408,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -416,6 +422,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -427,7 +434,6 @@ TestI.obj: \
     "$(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" \
@@ -450,7 +456,6 @@ TestI.obj: \
     "$(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" \
@@ -478,6 +483,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -486,6 +492,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -526,7 +533,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -540,6 +547,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -551,7 +559,6 @@ Server.obj: \
     "$(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" \
@@ -574,7 +581,6 @@ Server.obj: \
     "$(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" \
@@ -607,6 +613,7 @@ Collocated.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -615,6 +622,7 @@ Collocated.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -655,7 +663,7 @@ Collocated.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -669,6 +677,7 @@ Collocated.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -680,7 +689,6 @@ Collocated.obj: \
     "$(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" \
@@ -703,7 +711,6 @@ Collocated.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/inheritance/AllTests.cpp b/cpp/test/Ice/inheritance/AllTests.cpp
index 31a7613abeb..dd316ac08c8 100644
--- a/cpp/test/Ice/inheritance/AllTests.cpp
+++ b/cpp/test/Ice/inheritance/AllTests.cpp
@@ -14,227 +14,576 @@
 using namespace std;
 using namespace Test;
 
-InitialPrx
+InitialPrxPtr
 allTests(const Ice::CommunicatorPtr& communicator)
 {
     cout << "testing stringToProxy... " << flush;
     string ref = "initial:default -p 12010";
-    Ice::ObjectPrx base = communicator->stringToProxy(ref);
+    Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
 
     cout << "testing checked cast... " << flush;
-    InitialPrx initial = InitialPrx::checkedCast(base);
+    InitialPrxPtr initial = ICE_CHECKED_CAST(InitialPrx, base);
     test(initial);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(initial, base));
+#else
     test(initial == base);
+#endif
     cout << "ok" << endl;
 
     cout << "getting proxies for class hierarchy... " << flush;
-    MA::CAPrx ca = initial->caop();
-    MB::CBPrx cb = initial->cbop();
-    MA::CCPrx cc = initial->ccop();
-    MA::CDPrx cd = initial->cdop();
+    MA::CAPrxPtr ca = initial->caop();
+    MB::CBPrxPtr cb = initial->cbop();
+    MA::CCPrxPtr cc = initial->ccop();
+    MA::CDPrxPtr cd = initial->cdop();
+#ifdef ICE_CPP11_MAPPING
+    test(!Ice::targetEquals(ca, cb));
+    test(!Ice::targetEquals(ca, cc));
+    test(!Ice::targetEquals(ca, cd));
+    test(!Ice::targetEquals(cb, cc));
+    test(!Ice::targetEquals(cb, cd));
+    test(!Ice::targetEquals(cc, cd));
+#else
     test(ca != cb);
     test(ca != cc);
     test(ca != cd);
     test(cb != cc);
     test(cb != cd);
     test(cc != cd);
+#endif
     cout << "ok" << endl;
 
     cout << "getting proxies for interface hierarchy... " << flush;
-    MA::IAPrx ia = initial->iaop();
-    MB::IB1Prx ib1 = initial->ib1op();
-    MB::IB2Prx ib2 = initial->ib2op();
-    MA::ICPrx ic = initial->icop();
+    MA::IAPrxPtr ia = initial->iaop();
+    MB::IB1PrxPtr ib1 = initial->ib1op();
+    MB::IB2PrxPtr ib2 = initial->ib2op();
+    MA::ICPrxPtr ic = initial->icop();
+#ifdef ICE_CPP11_MAPPING
+    test(!Ice::targetEquals(ia, ib1));
+    test(!Ice::targetEquals(ia, ib2));
+    test(!Ice::targetEquals(ia, ic));
+    test(!Ice::targetEquals(ib1, ic));
+    test(!Ice::targetEquals(ib2, ic));
+#else
     test(ia != ib1);
     test(ia != ib2);
     test(ia != ic);
     test(ib1 != ic);
     test(ib2 != ic);
+#endif
     cout << "ok" << endl;
 
     cout << "invoking proxy operations on class hierarchy... " << flush;
-    MA::CAPrx cao;
-    MB::CBPrx cbo;
-    MA::CCPrx cco;
+    MA::CAPrxPtr cao;
+    MB::CBPrxPtr cbo;
+    MA::CCPrxPtr cco;
 
     cao = ca->caop(ca);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, ca));
+#else
     test(cao == ca);
+#endif
+
     cao = ca->caop(cb);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cb));
+#else
     test(cao == cb);
+#endif
+
     cao = ca->caop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cc));
+#else
     test(cao == cc);
+#endif
+
     cao = cb->caop(ca);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, ca));
+#else
     test(cao == ca);
+#endif
+    
     cao = cb->caop(cb);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cb));
+#else
     test(cao == cb);
+#endif
+
     cao = cb->caop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cc));
+#else
     test(cao == cc);
+#endif
+
     cao = cc->caop(ca);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, ca));
+#else
     test(cao == ca);
+#endif
+
     cao = cc->caop(cb);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cb));
+#else
     test(cao == cb);
+#endif
+
     cao = cc->caop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cc));
+#else
     test(cao == cc);
+#endif
 
     cao = cb->cbop(cb);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cb));
+#else
     test(cao == cb);
+#endif
+
     cbo = cb->cbop(cb);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cbo, cb));
+#else
     test(cbo == cb);
+#endif
+
     cao = cb->cbop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cc));
+#else
     test(cao == cc);
+#endif
+
     cbo = cb->cbop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cbo, cc));
+#else
     test(cbo == cc);
+#endif
+
     cao = cc->cbop(cb);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cb));
+#else
     test(cao == cb);
+#endif
+
     cbo = cc->cbop(cb);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cbo, cb));
+#else
     test(cbo == cb);
+#endif
+
     cao = cc->cbop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cc));
+#else
     test(cao == cc);
+#endif
+    
     cbo = cc->cbop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cbo, cc));
+#else
     test(cbo == cc);
+#endif
 
     cao = cc->ccop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cc));
+#else
     test(cao == cc);
+#endif
+    
     cbo = cc->ccop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cbo, cc));
+#else
     test(cbo == cc);
+#endif
+    
     cco = cc->ccop(cc);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cco, cc));
+#else
     test(cco == cc);
+#endif
     cout << "ok" << endl;
 
     cout << "ditto, but for interface hierarchy... " << flush;
-    MA::IAPrx iao;
-    MB::IB1Prx ib1o;
-    MB::IB2Prx ib2o;
-    MA::ICPrx ico;
+    MA::IAPrxPtr iao;
+    MB::IB1PrxPtr ib1o;
+    MB::IB2PrxPtr ib2o;
+    MA::ICPrxPtr ico;
 
     iao = ia->iaop(ia);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ia));
+#else
     test(iao == ia);
+#endif
+
     iao = ia->iaop(ib1);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib1));
+#else
     test(iao == ib1);
+#endif
+
     iao = ia->iaop(ib2);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib2));
+#else
     test(iao == ib2);
+#endif
+
     iao = ia->iaop(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ic));
+#else
     test(iao == ic);
+#endif
+
     iao = ib1->iaop(ia);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ia));
+#else
     test(iao == ia);
+#endif
+
     iao = ib1->iaop(ib1);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib1));
+#else
     test(iao == ib1);
+#endif
+
     iao = ib1->iaop(ib2);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib2));
+#else
     test(iao == ib2);
+#endif
+
     iao = ib1->iaop(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ic));
+#else
     test(iao == ic);
+#endif
+
     iao = ib2->iaop(ia);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ia));
+#else
     test(iao == ia);
+#endif
+
     iao = ib2->iaop(ib1);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib1));
+#else
     test(iao == ib1);
+#endif
+
     iao = ib2->iaop(ib2);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib2));
+#else
     test(iao == ib2);
+#endif
+
     iao = ib2->iaop(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ic));
+#else
     test(iao == ic);
+#endif
+
     iao = ic->iaop(ia);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ia));
+#else
     test(iao == ia);
+#endif
+
     iao = ic->iaop(ib1);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib1));
+#else
     test(iao == ib1);
+#endif
+
     iao = ic->iaop(ib2);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib2));
+#else
     test(iao == ib2);
+#endif
+
     iao = ic->iaop(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ic));
+#else
     test(iao == ic);
+#endif
 
     iao = ib1->ib1op(ib1);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib1));
+#else
     test(iao == ib1);
+#endif
+
     ib1o = ib1->ib1op(ib1);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib1o, ib1));
+#else
     test(ib1o == ib1);
+#endif
+
     iao = ib1->ib1op(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ic));
+#else
     test(iao == ic);
+#endif
+
     ib1o = ib1->ib1op(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib1o, ic));
+#else
     test(ib1o == ic);
+#endif
+
     iao = ic->ib1op(ib1);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib1));
+#else
     test(iao == ib1);
+#endif
+
     ib1o = ic->ib1op(ib1);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib1o, ib1));
+#else
     test(ib1o == ib1);
+#endif
+
     iao = ic->ib1op(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ic));
+#else
     test(iao == ic);
+#endif
     ib1o = ic->ib1op(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib1o, ic));
+#else
     test(ib1o == ic);
+#endif
 
     iao = ib2->ib2op(ib2);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib2));
+#else
     test(iao == ib2);
+#endif
+
     ib2o = ib2->ib2op(ib2);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib2o, ib2));
+#else
     test(ib2o == ib2);
+#endif
+
     iao = ib2->ib2op(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ic));
+#else
     test(iao == ic);
+#endif
+
     ib2o = ib2->ib2op(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib2o, ic));
+#else
     test(ib2o == ic);
+#endif
+
     iao = ic->ib2op(ib2);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ib2));
+#else
     test(iao == ib2);
+#endif
+
     ib2o = ic->ib2op(ib2);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib2o, ib2));
+#else
     test(ib2o == ib2);
+#endif
+
     iao = ic->ib2op(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ic));
+#else
     test(iao == ic);
+#endif
+
     ib2o = ic->ib2op(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib2o, ic));
+#else
     test(ib2o == ic);
+#endif
 
     iao = ic->icop(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, ic));
+#else
     test(iao == ic);
+#endif
+
     ib1o = ic->icop(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib1o, ic));
+#else
     test(ib1o == ic);
+#endif
+
     ib2o = ic->icop(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib2o, ic));
+#else
     test(ib2o == ic);
+#endif
+
     ico = ic->icop(ic);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ico, ic));
+#else
     test(ico == ic);
+#endif
 
     cout << "ok" << endl;
 
     cout << "ditto, but for class implementing interfaces... " << flush;
-    MA::CDPrx cdo;
+    MA::CDPrxPtr cdo;
 
     cao = cd->caop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cd));
+#else
     test(cao == cd);
+#endif
+
     cbo = cd->cbop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cbo, cd));
+#else
     test(cbo == cd);
+#endif
+
     cco = cd->ccop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cco, cd));
+#else
     test(cco == cd);
+#endif
 
     iao = cd->iaop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, cd));
+#else
     test(iao == cd);
+#endif
+
     ib1o = cd->ib1op(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib1o, cd));
+#else
     test(ib1o == cd);
+#endif
+
     ib2o = cd->ib2op(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib2o, cd));
+#else
     test(ib2o == cd);
+#endif
 
     cao = cd->cdop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cao, cd));
+#else
     test(cao == cd);
+#endif
+
     cbo = cd->cdop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cbo, cd));
+#else
     test(cbo == cd);
+#endif
+
     cco = cd->cdop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(cco, cd));
+#else
     test(cco == cd);
+#endif
 
     iao = cd->cdop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(iao, cd));
+#else
     test(iao == cd);
+#endif
+
     ib1o = cd->cdop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib1o, cd));
+#else
     test(ib1o == cd);
+#endif
+
     ib2o = cd->cdop(cd);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(ib2o, cd));
+#else
     test(ib2o == cd);
+#endif
 
     cout << "ok" << endl;
     
     cout << "testing one shot constructor... " << flush;
     {
-        MC::APtr a = new MC::A(1);
+        MC::APtr a = ICE_MAKE_SHARED(MC::A, 1);
         test(a->aA == 1);
         
-        MC::BPtr b = new MC::B(1, 2);
+        MC::BPtr b = ICE_MAKE_SHARED(MC::B, 1, 2);
         test(b->aA == 1);
         test(b->bB == 2);
         
-        MC::CPtr c = new MC::C(1, 2, 3);
+        MC::CPtr c = ICE_MAKE_SHARED(MC::C, 1, 2, 3);
         test(c->aA == 1);
         test(c->bB == 2);
         test(c->cC == 3);
         
-        MC::DPtr d = new MC::D(1, 2, 3, 4);
+        MC::DPtr d = ICE_MAKE_SHARED(MC::D, 1, 2, 3, 4);
         test(d->aA == 1);
         test(d->bB == 2);
         test(d->cC == 3);
@@ -242,19 +591,19 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
     
     {
-        MD::APtr a = new MD::A(1);
+        MD::APtr a = ICE_MAKE_SHARED(MD::A, 1);
         test(a->aA == 1);
         
-        MD::BPtr b = new MD::B(1, 2);
+        MD::BPtr b = ICE_MAKE_SHARED(MD::B, 1, 2);
         test(b->aA == 1);
         test(b->bB == 2);
         
-        MD::CPtr c = new MD::C(1, 2, 3);
+        MD::CPtr c = ICE_MAKE_SHARED(MD::C, 1, 2, 3);
         test(c->aA == 1);
         test(c->bB == 2);
         test(c->cC == 3);
         
-        MD::DPtr d = new MD::D(1, 2, 3, 4);
+        MD::DPtr d = ICE_MAKE_SHARED(MD::D, 1, 2, 3, 4);
         test(d->aA == 1);
         test(d->bB == 2);
         test(d->cC == 3);
@@ -262,19 +611,19 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
     
     {
-        ME::APtr a = new ME::A(1);
+        ME::APtr a = ICE_MAKE_SHARED(ME::A, 1);
         test(a->aA == 1);
         
-        ME::BPtr b = new ME::B(1, 2);
+        ME::BPtr b = ICE_MAKE_SHARED(ME::B, 1, 2);
         test(b->aA == 1);
         test(b->bB == 2);
         
-        ME::CPtr c = new ME::C(1, 2, 3);
+        ME::CPtr c = ICE_MAKE_SHARED(ME::C, 1, 2, 3);
         test(c->aA == 1);
         test(c->bB == 2);
         test(c->cC == 3);
 
-        ME::DPtr d = new ME::D(1, 2, 3, 4);
+        ME::DPtr d = ICE_MAKE_SHARED(ME::D, 1, 2, 3, 4);
         test(d->aA == 1);
         test(d->bB == 2);
         test(d->cC == 3);
@@ -282,19 +631,19 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
     
     {
-        MF::APtr a = new MF::A(1);
+        MF::APtr a = ICE_MAKE_SHARED(MF::A, 1);
         test(a->aA == 1);
         
-        MF::BPtr b = new MF::B(1, 2);
+        MF::BPtr b = ICE_MAKE_SHARED(MF::B, 1, 2);
         test(b->aA == 1);
         test(b->bB == 2);
         
-        MF::CPtr c = new MF::C(1, 2, 3);
+        MF::CPtr c = ICE_MAKE_SHARED(MF::C, 1, 2, 3);
         test(c->aA == 1);
         test(c->bB == 2);
         test(c->cC == 3);
 
-        MF::DPtr d = new MF::D(1, 2, 3, 4);
+        MF::DPtr d = ICE_MAKE_SHARED(MF::D, 1, 2, 3, 4);
         test(d->aA == 1);
         test(d->bB == 2);
         test(d->cC == 3);
@@ -302,19 +651,19 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
     
     {
-        MG::APtr a = new MG::A(1);
+        MG::APtr a = ICE_MAKE_SHARED(MG::A, 1);
         test(a->aA == 1);
         
-        MG::BPtr b = new MG::B(1, 2);
+        MG::BPtr b = ICE_MAKE_SHARED(MG::B, 1, 2);
         test(b->aA == 1);
         test(b->bB == 2);
         
-        MG::CPtr c = new MG::C(1, 2, 3);
+        MG::CPtr c = ICE_MAKE_SHARED(MG::C, 1, 2, 3);
         test(c->aA == 1);
         test(c->bB == 2);
         test(c->cC == 3);
 
-        MG::DPtr d = new MG::D(1, 2, 3, 4);
+        MG::DPtr d = ICE_MAKE_SHARED(MG::D, 1, 2, 3, 4);
         test(d->aA == 1);
         test(d->bB == 2);
         test(d->cC == 3);
@@ -322,19 +671,19 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
     
     {
-        MH::APtr a = new MH::A(1);
+        MH::APtr a = ICE_MAKE_SHARED(MH::A, 1);
         test(a->aA == 1);
         
-        MH::BPtr b = new MH::B(1, 2);
+        MH::BPtr b = ICE_MAKE_SHARED(MH::B, 1, 2);
         test(b->aA == 1);
         test(b->bB == 2);
         
-        MH::CPtr c = new MH::C(1, 2, 3);
+        MH::CPtr c = ICE_MAKE_SHARED(MH::C, 1, 2, 3);
         test(c->aA == 1);
         test(c->bB == 2);
         test(c->cC == 3);
 
-        MH::DPtr d = new MH::D(1, 2, 3, 4);
+        MH::DPtr d = ICE_MAKE_SHARED(MH::D, 1, 2, 3, 4);
         test(d->aA == 1);
         test(d->bB == 2);
         test(d->cC == 3);
diff --git a/cpp/test/Ice/inheritance/Client.cpp b/cpp/test/Ice/inheritance/Client.cpp
index c5a16298181..9256724470f 100644
--- a/cpp/test/Ice/inheritance/Client.cpp
+++ b/cpp/test/Ice/inheritance/Client.cpp
@@ -19,8 +19,8 @@ using namespace Test;
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
-    InitialPrx allTests(const Ice::CommunicatorPtr&);
-    InitialPrx initial = allTests(communicator);
+    InitialPrxPtr allTests(const Ice::CommunicatorPtr&);
+    InitialPrxPtr initial = allTests(communicator);
     initial->shutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/inheritance/Collocated.cpp b/cpp/test/Ice/inheritance/Collocated.cpp
index 4948c224464..5562c432c99 100644
--- a/cpp/test/Ice/inheritance/Collocated.cpp
+++ b/cpp/test/Ice/inheritance/Collocated.cpp
@@ -21,10 +21,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    Ice::ObjectPtr object = new InitialI(adapter);
+    Ice::ObjectPtr object = ICE_MAKE_SHARED(InitialI, adapter);
     adapter->add(object, communicator->stringToIdentity("initial"));
 
-    InitialPrx allTests(const Ice::CommunicatorPtr&);
+    InitialPrxPtr allTests(const Ice::CommunicatorPtr&);
     allTests(communicator);
 
     return EXIT_SUCCESS;
diff --git a/cpp/test/Ice/inheritance/Server.cpp b/cpp/test/Ice/inheritance/Server.cpp
index a62a97dfa8d..cec439b41d5 100644
--- a/cpp/test/Ice/inheritance/Server.cpp
+++ b/cpp/test/Ice/inheritance/Server.cpp
@@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    Ice::ObjectPtr object = new InitialI(adapter);
+    Ice::ObjectPtr object = ICE_MAKE_SHARED(InitialI, adapter);
     adapter->add(object, communicator->stringToIdentity("initial"));
     adapter->activate();
     TEST_READY
diff --git a/cpp/test/Ice/inheritance/TestI.cpp b/cpp/test/Ice/inheritance/TestI.cpp
index 87e8cd3451c..59da259eb00 100644
--- a/cpp/test/Ice/inheritance/TestI.cpp
+++ b/cpp/test/Ice/inheritance/TestI.cpp
@@ -12,64 +12,64 @@
 
 using namespace Test;
 
-MA::CAPrx
-CAI_::caop(const MA::CAPrx& p, const Ice::Current&)
+MA::CAPrxPtr
+CAI_::caop(const MA::CAPrxPtr& p, const Ice::Current&)
 {
     return p;
 }
 
-MB::CBPrx
-CBI::cbop(const MB::CBPrx& p, const Ice::Current&)
+MB::CBPrxPtr
+CBI::cbop(const MB::CBPrxPtr& p, const Ice::Current&)
 {
     return p;
 }
 
-MA::CCPrx
-CCI::ccop(const MA::CCPrx& p, const Ice::Current&)
+MA::CCPrxPtr
+CCI::ccop(const MA::CCPrxPtr& p, const Ice::Current&)
 {
     return p;
 }
 
-MA::CDPrx
-CDI::cdop(const MA::CDPrx& p, const Ice::Current&)
+MA::CDPrxPtr
+CDI::cdop(const MA::CDPrxPtr& p, const Ice::Current&)
 {
     return p;
 }
 
-MA::IAPrx
-IAI::iaop(const MA::IAPrx& p, const Ice::Current&)
+MA::IAPrxPtr
+IAI::iaop(const MA::IAPrxPtr& p, const Ice::Current&)
 {
     return p;
 }
 
-MB::IB1Prx
-IB1I::ib1op(const MB::IB1Prx& p, const Ice::Current&)
+MB::IB1PrxPtr
+IB1I::ib1op(const MB::IB1PrxPtr& p, const Ice::Current&)
 {
     return p;
 }
 
-MB::IB2Prx
-IB2I::ib2op(const MB::IB2Prx& p, const Ice::Current&)
+MB::IB2PrxPtr
+IB2I::ib2op(const MB::IB2PrxPtr& p, const Ice::Current&)
 {
     return p;
 }
 
-MA::ICPrx
-ICI::icop(const MA::ICPrx& p, const Ice::Current&)
+MA::ICPrxPtr
+ICI::icop(const MA::ICPrxPtr& p, const Ice::Current&)
 {
     return p;
 }
 
 InitialI::InitialI(const Ice::ObjectAdapterPtr& adapter)
 {
-    _ca = MA::CAPrx::uncheckedCast(adapter->addWithUUID(new CAI_));
-    _cb = MB::CBPrx::uncheckedCast(adapter->addWithUUID(new CBI));
-    _cc = MA::CCPrx::uncheckedCast(adapter->addWithUUID(new CCI));
-    _cd = MA::CDPrx::uncheckedCast(adapter->addWithUUID(new CDI));
-    _ia = MA::IAPrx::uncheckedCast(adapter->addWithUUID(new IAI));
-    _ib1 = MB::IB1Prx::uncheckedCast(adapter->addWithUUID(new IB1I));
-    _ib2 = MB::IB2Prx::uncheckedCast(adapter->addWithUUID(new IB2I));
-    _ic = MA::ICPrx::uncheckedCast(adapter->addWithUUID(new ICI));
+    _ca = ICE_UNCHECKED_CAST(MA::CAPrx, adapter->addWithUUID(ICE_MAKE_SHARED(CAI_)));
+    _cb = ICE_UNCHECKED_CAST(MB::CBPrx, adapter->addWithUUID(ICE_MAKE_SHARED(CBI)));
+    _cc = ICE_UNCHECKED_CAST(MA::CCPrx, adapter->addWithUUID(ICE_MAKE_SHARED(CCI)));
+    _cd = ICE_UNCHECKED_CAST(MA::CDPrx, adapter->addWithUUID(ICE_MAKE_SHARED(CDI)));
+    _ia = ICE_UNCHECKED_CAST(MA::IAPrx, adapter->addWithUUID(ICE_MAKE_SHARED(IAI)));
+    _ib1 = ICE_UNCHECKED_CAST(MB::IB1Prx, adapter->addWithUUID(ICE_MAKE_SHARED(IB1I)));
+    _ib2 = ICE_UNCHECKED_CAST(MB::IB2Prx, adapter->addWithUUID(ICE_MAKE_SHARED(IB2I)));
+    _ic = ICE_UNCHECKED_CAST(MA::ICPrx, adapter->addWithUUID(ICE_MAKE_SHARED(ICI)));
 }
 
 void
@@ -78,49 +78,49 @@ InitialI::shutdown(const Ice::Current& current)
     current.adapter->getCommunicator()->shutdown();
 }
 
-MA::CAPrx
+MA::CAPrxPtr
 InitialI::caop(const Ice::Current&)
 {
     return _ca;
 }
 
-MB::CBPrx
+MB::CBPrxPtr
 InitialI::cbop(const Ice::Current&)
 {
     return _cb;
 }
 
-MA::CCPrx
+MA::CCPrxPtr
 InitialI::ccop(const Ice::Current&)
 {
     return _cc;
 }
 
-MA::CDPrx
+MA::CDPrxPtr
 InitialI::cdop(const Ice::Current&)
 {
     return _cd;
 }
 
-MA::IAPrx
+MA::IAPrxPtr
 InitialI::iaop(const Ice::Current&)
 {
     return _ia;
 }
 
-MB::IB1Prx
+MB::IB1PrxPtr
 InitialI::ib1op(const Ice::Current&)
 {
     return _ib1;
 }
 
-MB::IB2Prx
+MB::IB2PrxPtr
 InitialI::ib2op(const Ice::Current&)
 {
     return _ib2;
 }
 
-MA::ICPrx
+MA::ICPrxPtr
 InitialI::icop(const Ice::Current&)
 {
     return _ic;
diff --git a/cpp/test/Ice/inheritance/TestI.h b/cpp/test/Ice/inheritance/TestI.h
index 3ab1be62372..bdb11e987da 100644
--- a/cpp/test/Ice/inheritance/TestI.h
+++ b/cpp/test/Ice/inheritance/TestI.h
@@ -20,27 +20,85 @@ public:
 
     virtual void shutdown(const Ice::Current&);
 
-    virtual Test::MA::CAPrx caop(const Ice::Current&);
-    virtual Test::MB::CBPrx cbop(const Ice::Current&);
-    virtual Test::MA::CCPrx ccop(const Ice::Current&);
-    virtual Test::MA::CDPrx cdop(const Ice::Current&);
-    virtual Test::MA::IAPrx iaop(const Ice::Current&);
-    virtual Test::MB::IB1Prx ib1op(const Ice::Current&);
-    virtual Test::MB::IB2Prx ib2op(const Ice::Current&);
-    virtual Test::MA::ICPrx icop(const Ice::Current&);
+    virtual Test::MA::CAPrxPtr caop(const Ice::Current&);
+    virtual Test::MB::CBPrxPtr cbop(const Ice::Current&);
+    virtual Test::MA::CCPrxPtr ccop(const Ice::Current&);
+    virtual Test::MA::CDPrxPtr cdop(const Ice::Current&);
+    virtual Test::MA::IAPrxPtr iaop(const Ice::Current&);
+    virtual Test::MB::IB1PrxPtr ib1op(const Ice::Current&);
+    virtual Test::MB::IB2PrxPtr ib2op(const Ice::Current&);
+    virtual Test::MA::ICPrxPtr icop(const Ice::Current&);
 
 private:
 
-    Test::MA::CAPrx _ca;
-    Test::MB::CBPrx _cb;
-    Test::MA::CCPrx _cc;
-    Test::MA::CDPrx _cd;
-    Test::MA::IAPrx _ia;
-    Test::MB::IB1Prx _ib1;
-    Test::MB::IB2Prx _ib2;
-    Test::MA::ICPrx _ic;
+    Test::MA::CAPrxPtr _ca;
+    Test::MB::CBPrxPtr _cb;
+    Test::MA::CCPrxPtr _cc;
+    Test::MA::CDPrxPtr _cd;
+    Test::MA::IAPrxPtr _ia;
+    Test::MB::IB1PrxPtr _ib1;
+    Test::MB::IB2PrxPtr _ib2;
+    Test::MA::ICPrxPtr _ic;
 };
 
+#ifdef ICE_CPP11_MAPPING
+class CAI_ : virtual public Test::MA::CADisp
+{
+public:
+
+    virtual std::shared_ptr<Test::MA::CAPrx> caop(const std::shared_ptr<Test::MA::CAPrx>&, const Ice::Current&);
+};
+
+class CBI : virtual public Test::MB::CBDisp, virtual public CAI_
+{
+public:
+
+    virtual std::shared_ptr<Test::MB::CBPrx> cbop(const std::shared_ptr<Test::MB::CBPrx>&, const Ice::Current&);
+};
+
+class CCI : virtual public Test::MA::CCDisp, virtual public CBI
+{
+public:
+
+    virtual std::shared_ptr<Test::MA::CCPrx> ccop(const std::shared_ptr<Test::MA::CCPrx>&, const Ice::Current&);
+};
+
+class IAI : virtual public Test::MA::IA
+{
+public:
+
+    virtual std::shared_ptr<Test::MA::IAPrx> iaop(const std::shared_ptr<Test::MA::IAPrx>&, const Ice::Current&);
+};
+
+class IB1I : virtual public Test::MB::IB1,
+             virtual public IAI
+{
+public:
+
+    virtual std::shared_ptr<Test::MB::IB1Prx> ib1op(const std::shared_ptr<Test::MB::IB1Prx>&, const Ice::Current&);
+};
+
+class IB2I : virtual public Test::MB::IB2, virtual public IAI
+{
+public:
+
+    virtual std::shared_ptr<Test::MB::IB2Prx> ib2op(const std::shared_ptr<Test::MB::IB2Prx>&, const Ice::Current&);
+};
+
+class ICI : virtual public Test::MA::IC, virtual public IB1I, virtual public IB2I
+{
+public:
+
+    virtual std::shared_ptr<Test::MA::ICPrx> icop(const std::shared_ptr<Test::MA::ICPrx>&, const Ice::Current&);
+};
+
+class CDI : virtual public Test::MA::CDDisp, virtual public CCI, virtual public IB1I, virtual public IB2I
+{
+public:
+
+    virtual std::shared_ptr<Test::MA::CDPrx> cdop(const std::shared_ptr<Test::MA::CDPrx>&, const Ice::Current&);
+};
+#else
 class CAI_ : virtual public Test::MA::CA
 {
 public:
@@ -96,5 +154,6 @@ public:
 
     virtual Test::MA::CDPrx cdop(const Test::MA::CDPrx&, const Ice::Current&);
 };
+#endif
 
 #endif
diff --git a/cpp/test/Ice/interceptor/.depend.mak b/cpp/test/Ice/interceptor/.depend.mak
index c0afe11efaf..9e0737a341a 100755
--- a/cpp/test/Ice/interceptor/.depend.mak
+++ b/cpp/test/Ice/interceptor/.depend.mak
@@ -18,6 +18,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -26,6 +27,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -66,7 +68,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -80,6 +82,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -91,7 +94,6 @@ Client.obj: \
     "$(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" \
@@ -114,7 +116,6 @@ Client.obj: \
     "$(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" \
@@ -150,6 +151,7 @@ InterceptorI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -158,6 +160,7 @@ InterceptorI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -198,7 +201,7 @@ InterceptorI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -212,6 +215,7 @@ InterceptorI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -223,7 +227,6 @@ InterceptorI.obj: \
     "$(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" \
@@ -246,7 +249,6 @@ InterceptorI.obj: \
     "$(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" \
@@ -281,6 +283,7 @@ AMDInterceptorI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -289,6 +292,7 @@ AMDInterceptorI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -329,7 +333,7 @@ AMDInterceptorI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -343,6 +347,7 @@ AMDInterceptorI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -354,7 +359,6 @@ AMDInterceptorI.obj: \
     "$(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" \
@@ -377,7 +381,6 @@ AMDInterceptorI.obj: \
     "$(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" \
@@ -409,6 +412,7 @@ MyObjectI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -417,6 +421,7 @@ MyObjectI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -457,7 +462,7 @@ MyObjectI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -471,6 +476,7 @@ MyObjectI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -482,7 +488,6 @@ MyObjectI.obj: \
     "$(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" \
@@ -505,7 +510,6 @@ MyObjectI.obj: \
     "$(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" \
@@ -536,6 +540,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -544,6 +549,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -578,7 +584,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -587,6 +593,7 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -594,7 +601,6 @@ Test.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -619,6 +625,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -627,6 +634,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -667,7 +675,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -681,6 +689,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -692,7 +701,6 @@ TestI.obj: \
     "$(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" \
@@ -715,7 +723,6 @@ TestI.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/invoke/.depend.mak b/cpp/test/Ice/invoke/.depend.mak
index 13749586535..888e9a27c13 100755
--- a/cpp/test/Ice/invoke/.depend.mak
+++ b/cpp/test/Ice/invoke/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -98,6 +100,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -106,6 +109,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -146,7 +150,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -160,6 +164,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -171,7 +176,6 @@ Client.obj: \
     "$(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" \
@@ -194,7 +198,6 @@ Client.obj: \
     "$(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" \
@@ -226,6 +229,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -234,6 +238,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -274,7 +279,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -288,6 +293,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -299,7 +305,6 @@ AllTests.obj: \
     "$(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" \
@@ -322,7 +327,6 @@ AllTests.obj: \
     "$(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" \
@@ -354,6 +358,7 @@ BlobjectI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -362,6 +367,7 @@ BlobjectI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -402,7 +408,7 @@ BlobjectI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -416,6 +422,7 @@ BlobjectI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -427,7 +434,6 @@ BlobjectI.obj: \
     "$(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" \
@@ -450,7 +456,6 @@ BlobjectI.obj: \
     "$(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" \
@@ -483,6 +488,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -491,6 +497,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -531,7 +538,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -545,6 +552,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -556,7 +564,6 @@ Server.obj: \
     "$(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" \
@@ -579,7 +586,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/invoke/AllTests.cpp b/cpp/test/Ice/invoke/AllTests.cpp
index 6af7732fce0..fc7cf33cf60 100644
--- a/cpp/test/Ice/invoke/AllTests.cpp
+++ b/cpp/test/Ice/invoke/AllTests.cpp
@@ -525,7 +525,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
 
     cout << "ok" << endl;
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
         cout << "testing asynchronous ice_invoke with C++11 style callbacks... " << flush;
 
     {
diff --git a/cpp/test/Ice/location/.depend.mak b/cpp/test/Ice/location/.depend.mak
index 60da4595b9b..aaf731b95f1 100755
--- a/cpp/test/Ice/location/.depend.mak
+++ b/cpp/test/Ice/location/.depend.mak
@@ -3,7 +3,7 @@ Test.h: \
     Test.ice \
     "$(slicedir)/Ice/Locator.ice" \
     "$(slicedir)/Ice/Identity.ice" \
-    "$(slicedir)/Ice/ProcessF.ice"
+    "$(slicedir)/Ice/Process.ice"
 
 Test.obj: \
 	Test.cpp \
@@ -19,6 +19,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -27,6 +28,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -61,7 +63,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -70,6 +72,7 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -77,9 +80,8 @@ Test.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Locator.h" \
-    "$(includedir)\Ice\ProcessF.h" \
+    "$(includedir)\Ice\Process.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -104,6 +106,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -112,6 +115,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -152,7 +156,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -166,6 +170,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -177,7 +182,6 @@ Client.obj: \
     "$(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" \
@@ -200,7 +204,6 @@ Client.obj: \
     "$(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" \
@@ -232,6 +235,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -240,6 +244,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -280,7 +285,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -294,6 +299,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -305,7 +311,6 @@ AllTests.obj: \
     "$(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" \
@@ -328,7 +333,6 @@ AllTests.obj: \
     "$(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" \
@@ -360,6 +364,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -368,6 +373,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -408,7 +414,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -422,6 +428,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -433,7 +440,6 @@ TestI.obj: \
     "$(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" \
@@ -456,7 +462,6 @@ TestI.obj: \
     "$(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" \
@@ -485,6 +490,7 @@ ServerLocator.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -493,6 +499,7 @@ ServerLocator.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -533,7 +540,7 @@ ServerLocator.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -547,6 +554,7 @@ ServerLocator.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -558,7 +566,6 @@ ServerLocator.obj: \
     "$(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" \
@@ -581,7 +588,6 @@ ServerLocator.obj: \
     "$(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" \
@@ -614,6 +620,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -622,6 +629,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -662,7 +670,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -676,6 +684,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -687,7 +696,6 @@ Server.obj: \
     "$(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" \
@@ -710,7 +718,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/logger/.depend.mak b/cpp/test/Ice/logger/.depend.mak
index 7075e5fc98e..14f054556ec 100755
--- a/cpp/test/Ice/logger/.depend.mak
+++ b/cpp/test/Ice/logger/.depend.mak
@@ -15,6 +15,7 @@ Client1.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -23,6 +24,7 @@ Client1.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -63,7 +65,7 @@ Client1.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -77,6 +79,7 @@ Client1.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -88,7 +91,6 @@ Client1.obj: \
     "$(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" \
@@ -111,7 +113,6 @@ Client1.obj: \
     "$(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" \
@@ -142,6 +143,7 @@ Client2.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -150,6 +152,7 @@ Client2.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -190,7 +193,7 @@ Client2.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -204,6 +207,7 @@ Client2.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -215,7 +219,6 @@ Client2.obj: \
     "$(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" \
@@ -238,7 +241,6 @@ Client2.obj: \
     "$(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" \
@@ -269,6 +271,7 @@ Client3.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -277,6 +280,7 @@ Client3.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -317,7 +321,7 @@ Client3.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -331,6 +335,7 @@ Client3.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -342,7 +347,6 @@ Client3.obj: \
     "$(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" \
@@ -365,7 +369,6 @@ Client3.obj: \
     "$(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" \
@@ -396,6 +399,7 @@ Client4.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -404,6 +408,7 @@ Client4.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -444,7 +449,7 @@ Client4.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -458,6 +463,7 @@ Client4.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -469,7 +475,6 @@ Client4.obj: \
     "$(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" \
@@ -492,7 +497,6 @@ Client4.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/metrics/.depend.mak b/cpp/test/Ice/metrics/.depend.mak
index 4d48ae21728..18aed21adc4 100755
--- a/cpp/test/Ice/metrics/.depend.mak
+++ b/cpp/test/Ice/metrics/.depend.mak
@@ -19,6 +19,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -27,6 +28,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -61,7 +63,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -70,13 +72,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -101,6 +103,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -109,6 +112,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -149,7 +153,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -163,6 +167,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -174,7 +179,6 @@ Client.obj: \
     "$(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" \
@@ -197,7 +201,6 @@ Client.obj: \
     "$(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" \
@@ -230,6 +233,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -238,6 +242,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -278,7 +283,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -292,6 +297,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -303,7 +309,6 @@ AllTests.obj: \
     "$(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" \
@@ -326,7 +331,6 @@ AllTests.obj: \
     "$(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" \
@@ -359,6 +363,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -367,6 +372,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -407,7 +413,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -421,6 +427,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -432,7 +439,6 @@ TestI.obj: \
     "$(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" \
@@ -455,7 +461,6 @@ TestI.obj: \
     "$(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" \
@@ -483,6 +488,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -491,6 +497,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -531,7 +538,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -545,6 +552,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -556,7 +564,6 @@ Server.obj: \
     "$(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" \
@@ -579,7 +586,6 @@ Server.obj: \
     "$(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" \
@@ -610,6 +616,7 @@ TestAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -618,6 +625,7 @@ TestAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -652,7 +660,7 @@ TestAMD.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -661,6 +669,7 @@ TestAMD.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -668,7 +677,6 @@ TestAMD.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -693,6 +701,7 @@ TestAMDI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -701,6 +710,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -741,7 +751,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -755,6 +765,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -766,7 +777,6 @@ TestAMDI.obj: \
     "$(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" \
@@ -789,7 +799,6 @@ TestAMDI.obj: \
     "$(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" \
@@ -817,6 +826,7 @@ ServerAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -825,6 +835,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -865,7 +876,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -879,6 +890,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -890,7 +902,6 @@ ServerAMD.obj: \
     "$(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" \
@@ -913,7 +924,6 @@ ServerAMD.obj: \
     "$(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" \
@@ -946,6 +956,7 @@ Collocated.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -954,6 +965,7 @@ Collocated.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -994,7 +1006,7 @@ Collocated.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1008,6 +1020,7 @@ Collocated.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1019,7 +1032,6 @@ Collocated.obj: \
     "$(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" \
@@ -1042,7 +1054,6 @@ Collocated.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/networkProxy/.depend.mak b/cpp/test/Ice/networkProxy/.depend.mak
index 5ea151ca1a6..3e6789ff9c6 100755
--- a/cpp/test/Ice/networkProxy/.depend.mak
+++ b/cpp/test/Ice/networkProxy/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -224,6 +227,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -232,6 +236,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -272,7 +277,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -286,6 +291,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -297,7 +303,6 @@ AllTests.obj: \
     "$(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" \
@@ -320,7 +325,6 @@ AllTests.obj: \
     "$(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" \
@@ -352,6 +356,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -360,6 +365,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -400,7 +406,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -414,6 +420,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -425,7 +432,6 @@ Server.obj: \
     "$(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" \
@@ -448,7 +454,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/objects/.depend.mak b/cpp/test/Ice/objects/.depend.mak
index c845ec47617..35104594691 100755
--- a/cpp/test/Ice/objects/.depend.mak
+++ b/cpp/test/Ice/objects/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -98,6 +100,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -106,6 +109,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -146,7 +150,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -160,6 +164,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -171,7 +176,6 @@ TestI.obj: \
     "$(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" \
@@ -194,7 +198,6 @@ TestI.obj: \
     "$(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" \
@@ -222,6 +225,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -230,6 +234,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -270,7 +275,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -284,6 +289,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -295,7 +301,6 @@ Client.obj: \
     "$(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" \
@@ -318,7 +323,6 @@ Client.obj: \
     "$(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" \
@@ -351,6 +355,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -359,6 +364,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -399,7 +405,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -413,6 +419,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -424,7 +431,6 @@ AllTests.obj: \
     "$(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" \
@@ -447,7 +453,6 @@ AllTests.obj: \
     "$(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" \
@@ -479,6 +484,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -487,6 +493,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -527,7 +534,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -541,6 +548,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -552,7 +560,6 @@ Server.obj: \
     "$(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" \
@@ -575,7 +582,6 @@ Server.obj: \
     "$(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" \
@@ -608,6 +614,7 @@ Collocated.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -616,6 +623,7 @@ Collocated.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -656,7 +664,7 @@ Collocated.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -670,6 +678,7 @@ Collocated.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -681,7 +690,6 @@ Collocated.obj: \
     "$(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" \
@@ -704,7 +712,6 @@ Collocated.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/objects/AllTests.cpp b/cpp/test/Ice/objects/AllTests.cpp
index ea7feee2778..c1115c698c2 100644
--- a/cpp/test/Ice/objects/AllTests.cpp
+++ b/cpp/test/Ice/objects/AllTests.cpp
@@ -26,9 +26,9 @@ void
 testUOE(const Ice::CommunicatorPtr& communicator)
 {
     string ref = "uoet:default -p 12010";
-    Ice::ObjectPrx base = communicator->stringToProxy(ref);
+    Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
     test(base);
-    UnexpectedObjectExceptionTestPrx uoet = UnexpectedObjectExceptionTestPrx::uncheckedCast(base);
+    UnexpectedObjectExceptionTestPrxPtr uoet = ICE_UNCHECKED_CAST(UnexpectedObjectExceptionTestPrx, base);
     test(uoet);
     try
     {
@@ -51,30 +51,34 @@ testUOE(const Ice::CommunicatorPtr& communicator)
     }
 }
 
-InitialPrx
+InitialPrxPtr
 allTests(const Ice::CommunicatorPtr& communicator)
 {
     cout << "testing stringToProxy... " << flush;
     string ref = "initial:default -p 12010";
-    Ice::ObjectPrx base = communicator->stringToProxy(ref);
+    Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
     test(base);
     cout << "ok" << endl;
 
     cout << "testing checked cast... " << flush;
-    InitialPrx initial = InitialPrx::checkedCast(base);
+    InitialPrxPtr initial = ICE_CHECKED_CAST(InitialPrx, base);
     test(initial);
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(initial, base));
+#else
     test(initial == base);
+#endif
     cout << "ok" << endl;
 
     cout << "testing constructor, copy constructor, and assignment operator... " << flush;
 
-    BasePtr ba1 = new Base;
+    BasePtr ba1 = ICE_MAKE_SHARED(Base);
     test(ba1->theS.str == "");
     test(ba1->str == "");
 
     S s;
     s.str = "hello";
-    BasePtr ba2 = new Base(s, "hi");
+    BasePtr ba2 = ICE_MAKE_SHARED(Base, s, "hi");
     test(ba2->theS.str == "hello");
     test(ba2->str == "hi");
 
@@ -82,7 +86,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     test(ba1->theS.str == "hello");
     test(ba1->str == "hi");
 
-    BasePtr bp1 = new Base();
+    BasePtr bp1 = ICE_MAKE_SHARED(Base);
     *bp1 = *ba2;
     test(bp1->theS.str == "hello");
     test(bp1->str == "hi");
@@ -91,11 +95,15 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
     cout << "testing ice_clone..." << flush;
 
-    BasePtr bp2 = BasePtr::dynamicCast(bp1->ice_clone());
+    BasePtr bp2 = ICE_DYNAMIC_CAST(Base, bp1->ice_clone());
     test(bp1->theS.str == bp2->theS.str);
     test(bp1->str == bp2->str);
     
-    AbstractBasePtr abp1 = new AbstractBaseI;
+#ifndef ICE_CPP11_MAPPING
+    //
+    // With C++11 mapping value classes are never abstracts.
+    //
+    AbstractBasePtr abp1 = new AbstractBaseI();
     try
     {
         abp1->ice_clone();
@@ -104,6 +112,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     catch(const Ice::CloneNotImplementedException&)
     {
     }
+#endif
     cout << "ok" << endl;
 
     cout << "getting B1... " << flush;
@@ -128,29 +137,42 @@ allTests(const Ice::CommunicatorPtr& communicator)
     
     cout << "checking consistency... " << flush;
     test(b1 != b2);
+#ifdef ICE_CPP11_MAPPING
+    test(b1 != dynamic_pointer_cast<B>(c));
+    test(b1 != dynamic_pointer_cast<B>(d));
+    test(b2 != dynamic_pointer_cast<B>(c));
+    test(b2 != dynamic_pointer_cast<B>(d));
+    test(c != dynamic_pointer_cast<C>(d));
+#else
     test(b1 != c);
     test(b1 != d);
     test(b2 != c);
     test(b2 != d);
     test(c != d);
+#endif
     test(b1->theB == b1);
-    test(b1->theC == 0);
-    test(BPtr::dynamicCast(b1->theA));
-    test(BPtr::dynamicCast(b1->theA)->theA == b1->theA);
-    test(BPtr::dynamicCast(b1->theA)->theB == b1);
-    test(CPtr::dynamicCast(BPtr::dynamicCast(b1->theA)->theC));
-    test(CPtr::dynamicCast(BPtr::dynamicCast(b1->theA)->theC)->theB == b1->theA);
+    test(b1->theC == ICE_NULLPTR);
+    test(ICE_DYNAMIC_CAST(B, b1->theA));
+    test(ICE_DYNAMIC_CAST(B, b1->theA)->theA == b1->theA);
+    test(ICE_DYNAMIC_CAST(B, b1->theA)->theB == b1);
+    test(ICE_DYNAMIC_CAST(C, ICE_DYNAMIC_CAST(B, b1->theA)->theC));
+    test(ICE_DYNAMIC_CAST(C, ICE_DYNAMIC_CAST(B, b1->theA)->theC)->theB == b1->theA);
 
+#ifdef ICE_CPP11_MAPPING
+    test(b1->preMarshalInvoked);
+    test(b1->theA->preMarshalInvoked);
+    test(dynamic_pointer_cast<B>(b1->theA)->theC->preMarshalInvoked);
+#else
     test(b1->preMarshalInvoked);
     test(b1->postUnmarshalInvoked());
     test(b1->theA->preMarshalInvoked);
     test(b1->theA->postUnmarshalInvoked());
     test(BPtr::dynamicCast(b1->theA)->theC->preMarshalInvoked);
     test(BPtr::dynamicCast(b1->theA)->theC->postUnmarshalInvoked());
-    
+#endif
     // More tests possible for b2 and d, but I think this is already sufficient.
     test(b2->theA == b2);
-    test(d->theC == 0);
+    test(d->theC == ICE_NULLPTR);
     cout << "ok" << endl;
 
     cout << "getting B1, B2, C, and D all at once... " << flush;
@@ -162,6 +184,29 @@ allTests(const Ice::CommunicatorPtr& communicator)
     cout << "ok" << endl;
     
     cout << "checking consistency... " << flush;
+#ifdef ICE_CPP11_MAPPING
+    test(b1 != b2);
+    test(b1 != dynamic_pointer_cast<B>(c));
+    test(b1 != dynamic_pointer_cast<B>(d));
+    test(b2 != dynamic_pointer_cast<B>(c));
+    test(b2 != dynamic_pointer_cast<B>(d));
+    test(c != dynamic_pointer_cast<C>(d));
+    test(b1->theA == dynamic_pointer_cast<B>(b2));
+    test(b1->theB == dynamic_pointer_cast<B>(b1));
+    test(b1->theC == nullptr);
+    test(b2->theA == b2);
+    test(b2->theB == b1);
+    test(b2->theC == dynamic_pointer_cast<C>(c));
+    test(c->theB == b2);
+    test(d->theA == dynamic_pointer_cast<A>(b1));
+    test(d->theB == dynamic_pointer_cast<B>(b2));
+    test(d->theC == nullptr);
+
+    test(d->preMarshalInvoked);
+    test(d->theA->preMarshalInvoked);
+    test(d->theB->preMarshalInvoked);
+    test(d->theB->theC->preMarshalInvoked);
+#else
     test(b1 != b2);
     test(b1 != c);
     test(b1 != d);
@@ -170,15 +215,15 @@ allTests(const Ice::CommunicatorPtr& communicator)
     test(c != d);
     test(b1->theA == b2);
     test(b1->theB == b1);
-    test(b1->theC == 0);
+    test(b1->theC == ICE_NULLPTR);
     test(b2->theA == b2);
     test(b2->theB == b1);
     test(b2->theC == c);
     test(c->theB == b2);
     test(d->theA == b1);
     test(d->theB == b2);
-    test(d->theC == 0);
-    
+    test(d->theC == ICE_NULLPTR);
+
     test(d->preMarshalInvoked);
     test(d->postUnmarshalInvoked());
     test(d->theA->preMarshalInvoked);
@@ -187,28 +232,44 @@ allTests(const Ice::CommunicatorPtr& communicator)
     test(d->theB->postUnmarshalInvoked());
     test(d->theB->theC->preMarshalInvoked);
     test(d->theB->theC->postUnmarshalInvoked());
-
+#endif
     cout << "ok" << endl;
 
     cout << "testing protected members... " << flush;
+
     EPtr e = initial->getE();
-    test(e->checkValues());
     FPtr f = initial->getF();
+#ifndef ICE_CPP11_MAPPING
+    test(e->checkValues());
     test(f->checkValues());
     test(f->e2->checkValues());
+#endif
     cout << "ok" << endl;
 
     cout << "getting I, J and H... " << flush;
+#ifdef ICE_CPP11_MAPPING
+    shared_ptr<Ice::Value> i = initial->getI();
+    test(i->ice_id() == "::Test::I");
+    shared_ptr<Ice::Value> j = initial->getJ();
+    test(j->ice_id() == "::Test::J");
+    shared_ptr<Ice::Value> h = initial->getH();
+    test(h && dynamic_pointer_cast<H>(h));
+#else
     IPtr i = initial->getI();
     test(i);
     IPtr j = initial->getJ();
     test(j && JPtr::dynamicCast(j));
     IPtr h = initial->getH();
     test(h && HPtr::dynamicCast(h));
+#endif
     cout << "ok" << endl;
     
     cout << "getting D1... " << flush;
-    D1Ptr d1 = new D1(new A1("a1"), new A1("a2"), new A1("a3"), new A1("a4"));
+    D1Ptr d1 = ICE_MAKE_SHARED(D1,
+                               ICE_MAKE_SHARED(A1, "a1"),
+                               ICE_MAKE_SHARED(A1, "a2"),
+                               ICE_MAKE_SHARED(A1, "a3"),
+                               ICE_MAKE_SHARED(A1, "a4"));
     d1 = initial->getD1(d1);
     test(d1->a1->name == "a1");
     test(d1->a2->name == "a2");
@@ -242,7 +303,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     retS = initial->opBaseSeq(inS, outS);
 
     inS.resize(1);
-    inS[0] = new Base();
+    inS[0] = ICE_MAKE_SHARED(Base);
     retS = initial->opBaseSeq(inS, outS);
     test(retS.size() == 1 && outS.size() == 1);
     cout << "ok" << endl;
@@ -257,9 +318,12 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
     cout << "ok" << endl;
 
+#ifdef ICE_CPP11_MAPPING
+    // TODO
+#else
     cout << "testing UnexpectedObjectException... " << flush;
     testUOE(communicator);
     cout << "ok" << endl;
-
+#endif
     return initial;
 }
diff --git a/cpp/test/Ice/objects/Client.cpp b/cpp/test/Ice/objects/Client.cpp
index 303d79031af..471f63de90e 100644
--- a/cpp/test/Ice/objects/Client.cpp
+++ b/cpp/test/Ice/objects/Client.cpp
@@ -16,6 +16,16 @@ DEFINE_TEST("client")
 using namespace std;
 using namespace Test;
 
+#ifdef ICE_CPP11_MAPPING
+template<typename T>
+function<shared_ptr<T>(const string&)> makeFactory()
+{
+    return [](const string&)
+        {
+            return make_shared<T>();
+        };
+}
+#else
 class MyObjectFactory : public Ice::ObjectFactory
 {
 public:
@@ -64,10 +74,21 @@ public:
         // Nothing to do
     }
 };
+#endif
 
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
+#ifdef ICE_CPP11_MAPPING
+    communicator->addObjectFactory(makeFactory<BI>(), "::Test::B");
+    communicator->addObjectFactory(makeFactory<CI>(), "::Test::C");
+    communicator->addObjectFactory(makeFactory<DI>(), "::Test::D");
+    communicator->addObjectFactory(makeFactory<EI>(), "::Test::E");
+    communicator->addObjectFactory(makeFactory<FI>(), "::Test::F");
+    communicator->addObjectFactory(makeFactory<II>(), "::Test::I");
+    communicator->addObjectFactory(makeFactory<JI>(), "::Test::J");
+    communicator->addObjectFactory(makeFactory<HI>(), "::Test::H");
+#else
     Ice::ObjectFactoryPtr factory = new MyObjectFactory;
     communicator->addObjectFactory(factory, "::Test::B");
     communicator->addObjectFactory(factory, "::Test::C");
@@ -77,9 +98,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     communicator->addObjectFactory(factory, "::Test::I");
     communicator->addObjectFactory(factory, "::Test::J");
     communicator->addObjectFactory(factory, "::Test::H");
+#endif
 
-    InitialPrx allTests(const Ice::CommunicatorPtr&);
-    InitialPrx initial = allTests(communicator);
+    InitialPrxPtr allTests(const Ice::CommunicatorPtr&);
+    InitialPrxPtr initial = allTests(communicator);
     initial->shutdown();
     return EXIT_SUCCESS;
 }
diff --git a/cpp/test/Ice/objects/Collocated.cpp b/cpp/test/Ice/objects/Collocated.cpp
index 781c216a855..0d2f8562fa9 100644
--- a/cpp/test/Ice/objects/Collocated.cpp
+++ b/cpp/test/Ice/objects/Collocated.cpp
@@ -16,6 +16,16 @@ DEFINE_TEST("collocated")
 using namespace std;
 using namespace Test;
 
+#ifdef ICE_CPP11_MAPPING
+template<typename T>
+function<shared_ptr<T>(const string&)> makeFactory()
+{
+    return [](const string&)
+        {
+            return make_shared<T>();
+        };
+}
+#else
 class MyObjectFactory : public Ice::ObjectFactory
 {
 public:
@@ -64,10 +74,21 @@ public:
         // Nothing to do
     }
 };
+#endif
 
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
+#ifdef ICE_CPP11_MAPPING
+    communicator->addObjectFactory(makeFactory<BI>(), "::Test::B");
+    communicator->addObjectFactory(makeFactory<CI>(), "::Test::C");
+    communicator->addObjectFactory(makeFactory<DI>(), "::Test::D");
+    communicator->addObjectFactory(makeFactory<EI>(), "::Test::E");
+    communicator->addObjectFactory(makeFactory<FI>(), "::Test::F");
+    communicator->addObjectFactory(makeFactory<II>(), "::Test::I");
+    communicator->addObjectFactory(makeFactory<JI>(), "::Test::J");
+    communicator->addObjectFactory(makeFactory<HI>(), "::Test::H");
+#else
     Ice::ObjectFactoryPtr factory = new MyObjectFactory;
     communicator->addObjectFactory(factory, "::Test::B");
     communicator->addObjectFactory(factory, "::Test::C");
@@ -77,17 +98,19 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
     communicator->addObjectFactory(factory, "::Test::I");
     communicator->addObjectFactory(factory, "::Test::J");
     communicator->addObjectFactory(factory, "::Test::H");
+#endif
 
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    InitialPtr initial = new InitialI(adapter);
-    adapter->add(initial, communicator->stringToIdentity("initial"));
+    adapter->add(ICE_MAKE_SHARED(InitialI, adapter), communicator->stringToIdentity("initial"));
+#ifndef ICE_CPP11_MAPPING
     UnexpectedObjectExceptionTestIPtr uoet = new UnexpectedObjectExceptionTestI;
     adapter->add(uoet, communicator->stringToIdentity("uoet"));
-    InitialPrx allTests(const Ice::CommunicatorPtr&);
-    allTests(communicator);
+#endif
+    InitialPrxPtr allTests(const Ice::CommunicatorPtr&);
+    InitialPrxPtr initial = allTests(communicator);
     // We must call shutdown even in the collocated case for cyclic dependency cleanup
-    initial->shutdown(Ice::Current());
+    initial->shutdown();
     return EXIT_SUCCESS;
 }
 
diff --git a/cpp/test/Ice/objects/Server.cpp b/cpp/test/Ice/objects/Server.cpp
index f1a1a197d39..0098cb34953 100644
--- a/cpp/test/Ice/objects/Server.cpp
+++ b/cpp/test/Ice/objects/Server.cpp
@@ -16,6 +16,16 @@ DEFINE_TEST("server")
 using namespace std;
 using namespace Test;
 
+#ifdef ICE_CPP11_MAPPING
+template<typename T>
+function<shared_ptr<T>(const string&)> makeFactory()
+{
+    return [](const string&)
+        {
+            return make_shared<T>();
+        };
+}
+#else
 class MyObjectFactory : public Ice::ObjectFactory
 {
 public:
@@ -44,21 +54,32 @@ public:
         // Nothing to do
     }
 };
+#endif
 
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
+#ifdef ICE_CPP11_MAPPING
+    communicator->addObjectFactory(makeFactory<II>(), "::Test::I");
+    communicator->addObjectFactory(makeFactory<JI>(), "::Test::J");
+    communicator->addObjectFactory(makeFactory<HI>(), "::Test::H");
+#else
     Ice::ObjectFactoryPtr factory = new MyObjectFactory;
     communicator->addObjectFactory(factory, "::Test::I");
     communicator->addObjectFactory(factory, "::Test::J");
     communicator->addObjectFactory(factory, "::Test::H");
+#endif
 
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    InitialPtr initial = new InitialI(adapter);
-    adapter->add(initial, communicator->stringToIdentity("initial"));
+    adapter->add(ICE_MAKE_SHARED(InitialI, adapter), communicator->stringToIdentity("initial"));
+    
+#ifdef ICE_CPP11_MAPPING
+    //TODO
+#else
     UnexpectedObjectExceptionTestIPtr uoet = new UnexpectedObjectExceptionTestI;
     adapter->add(uoet, communicator->stringToIdentity("uoet"));
+#endif
     adapter->activate();
     TEST_READY
     communicator->waitForShutdown();
diff --git a/cpp/test/Ice/objects/TestI.cpp b/cpp/test/Ice/objects/TestI.cpp
index 5c4814ffab2..42d6ab7c553 100644
--- a/cpp/test/Ice/objects/TestI.cpp
+++ b/cpp/test/Ice/objects/TestI.cpp
@@ -11,6 +11,7 @@
 #include <TestI.h>
 
 using namespace Test;
+using namespace std;
 
 BI::BI() :
     _postUnmarshalInvoked(false)
@@ -116,10 +117,12 @@ InitialI::InitialI(const Ice::ObjectAdapterPtr& adapter) :
     _e(new EI),
     _f(new FI(_e))
 {
+#ifndef ICE_CPP11_MAPPING
     _b1->ice_collectable(true);
     _b2->ice_collectable(true);
     _c->ice_collectable(true);
     _d->ice_collectable(true);
+#endif
 
     _b1->theA = _b2; // Cyclic reference to another B
     _b1->theB = _b1; // Self reference.
@@ -204,6 +207,18 @@ InitialI::getAll(BPtr& b1, BPtr& b2, CPtr& c, DPtr& d, const Ice::Current&)
     d = _d;
 }
 
+#ifdef ICE_CPP11_MAPPING
+shared_ptr<Ice::Value>
+InitialI::getI(const Ice::Current&)
+{
+    return make_shared<II>();
+}
+
+void
+InitialI::setI(const shared_ptr<Ice::Value>&, const Ice::Current&)
+{
+}
+#else
 IPtr
 InitialI::getI(const Ice::Current&)
 {
@@ -214,6 +229,7 @@ void
 InitialI::setI(const IPtr&, const Ice::Current&)
 {
 }
+#endif
 
 BaseSeq
 InitialI::opBaseSeq(const BaseSeq& inSeq, BaseSeq& outSeq, const Ice::Current&)
@@ -225,19 +241,19 @@ InitialI::opBaseSeq(const BaseSeq& inSeq, BaseSeq& outSeq, const Ice::Current&)
 CompactPtr
 InitialI::getCompact(const Ice::Current&)
 {
-    return new CompactExt();
+    return ICE_MAKE_SHARED(CompactExt);
 }
 
 Test::Inner::APtr
 InitialI::getInnerA(const Ice::Current&)
 {
-    return new Inner::A(_b1);
+    return ICE_MAKE_SHARED(Inner::A, _b1);
 }
 
 Test::Inner::Sub::APtr
 InitialI::getInnerSubA(const Ice::Current&)
 {
-    return new Inner::Sub::A(new Inner::A(_b1));
+    return ICE_MAKE_SHARED(Inner::Sub::A, ICE_MAKE_SHARED(Inner::A, _b1));
 }
 
 void
@@ -256,6 +272,19 @@ InitialI::throwInnerSubEx(const Ice::Current&)
     throw ex;
 }
 
+#ifdef ICE_CPP11_MAPPING
+shared_ptr<Ice::Value>
+InitialI::getJ(const Ice::Current&)
+{
+    return make_shared<JI>();
+}
+
+shared_ptr<Ice::Value>
+InitialI::getH(const Ice::Current&)
+{
+    return make_shared<HI>();
+}
+#else
 IPtr
 InitialI::getJ(const Ice::Current&)
 {
@@ -267,6 +296,7 @@ InitialI::getH(const Ice::Current&)
 {
     return new HI();
 }
+#endif
 
 D1Ptr
 InitialI::getD1(const Test::D1Ptr& d1, const Ice::Current&)
@@ -277,9 +307,15 @@ InitialI::getD1(const Test::D1Ptr& d1, const Ice::Current&)
 void
 InitialI::throwEDerived(const Ice::Current&)
 {
-    throw EDerived(new A1("a1"), new A1("a2"), new A1("a3"), new A1("a4"));
+    throw EDerived(ICE_MAKE_SHARED(A1, "a1"),
+                   ICE_MAKE_SHARED(A1, "a2"),
+                   ICE_MAKE_SHARED(A1, "a3"),
+                   ICE_MAKE_SHARED(A1, "a4"));
 }
 
+#ifdef ICE_CPP11_MAPPING
+// TODO
+#else
 bool
 UnexpectedObjectExceptionTestI::ice_invoke(const std::vector<Ice::Byte>&,
                                            std::vector<Ice::Byte>& outParams,
@@ -288,10 +324,11 @@ UnexpectedObjectExceptionTestI::ice_invoke(const std::vector<Ice::Byte>&,
     Ice::CommunicatorPtr communicator = current.adapter->getCommunicator();
     Ice::OutputStreamPtr out = Ice::createOutputStream(communicator);
     out->startEncapsulation(current.encoding, Ice::DefaultFormat);
-    AlsoEmptyPtr ae = new AlsoEmpty;
+    AlsoEmptyPtr ae = ICE_MAKE_SHARED(AlsoEmpty);
     out->write(ae);
     out->writePendingObjects();
     out->endEncapsulation();
     out->finished(outParams);
     return true;
 }
+#endif
\ No newline at end of file
diff --git a/cpp/test/Ice/objects/TestI.h b/cpp/test/Ice/objects/TestI.h
index 127d5ad821e..ffe39565048 100644
--- a/cpp/test/Ice/objects/TestI.h
+++ b/cpp/test/Ice/objects/TestI.h
@@ -79,6 +79,15 @@ public:
     virtual bool checkValues(const Ice::Current&);
 };
 
+#ifdef ICE_CPP11_MAPPING
+class II : public ::Ice::InterfaceByValue<Test::I>
+{
+};
+
+class JI : public ::Ice::InterfaceByValue<Test::J>
+{
+};
+#else
 class II : public Test::I
 {
 };
@@ -86,12 +95,18 @@ class II : public Test::I
 class JI : public Test::J
 {
 };
+#endif
 
 class HI : public Test::H
 {
 };
 
-class InitialI : public Test::Initial
+class InitialI :
+#ifdef ICE_CPP11_MAPPING
+    public Test::InitialDisp
+#else
+    public Test::Initial
+#endif
 {
 public:
 
@@ -105,15 +120,25 @@ public:
     virtual Test::EPtr getE(const Ice::Current&);
     virtual Test::FPtr getF(const Ice::Current&);
     virtual void getAll(Test::BPtr&, Test::BPtr&, Test::CPtr&, Test::DPtr&, const Ice::Current&);
+    
+#ifdef ICE_CPP11_MAPPING
+    virtual ::std::shared_ptr<::Ice::Value> getI(const Ice::Current&);
+    virtual ::std::shared_ptr<::Ice::Value> getJ(const Ice::Current&);
+    virtual ::std::shared_ptr<::Ice::Value> getH(const Ice::Current&);
+#else
     virtual Test::IPtr getI(const Ice::Current&);
     virtual Test::IPtr getJ(const Ice::Current&);
     virtual Test::IPtr getH(const Ice::Current&);
-    
+#endif
+
     virtual Test::D1Ptr getD1(const Test::D1Ptr&, const Ice::Current&);
     virtual void throwEDerived(const Ice::Current&);
 
+#ifdef ICE_CPP11_MAPPING
+    virtual void setI(const ::std::shared_ptr<::Ice::Value>&, const Ice::Current&);
+#else
     virtual void setI(const Test::IPtr&, const Ice::Current&);
-
+#endif
     virtual Test::BaseSeq opBaseSeq(const Test::BaseSeq&, Test::BaseSeq&, const Ice::Current&);
 
     virtual Test::CompactPtr getCompact(const Ice::Current&);
diff --git a/cpp/test/Ice/operations/.depend.mak b/cpp/test/Ice/operations/.depend.mak
index d10167dde9f..e1f09c8229c 100755
--- a/cpp/test/Ice/operations/.depend.mak
+++ b/cpp/test/Ice/operations/.depend.mak
@@ -29,6 +29,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -37,6 +38,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -71,7 +73,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -80,13 +82,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -111,6 +113,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -119,6 +122,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -159,7 +163,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -173,6 +177,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -184,7 +189,6 @@ Client.obj: \
     "$(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" \
@@ -207,7 +211,6 @@ Client.obj: \
     "$(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" \
@@ -239,6 +242,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -247,6 +251,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -287,7 +292,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -301,6 +306,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -312,7 +318,6 @@ AllTests.obj: \
     "$(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" \
@@ -335,7 +340,6 @@ AllTests.obj: \
     "$(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" \
@@ -367,6 +371,7 @@ Twoways.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -375,6 +380,7 @@ Twoways.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -415,7 +421,7 @@ Twoways.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -429,6 +435,7 @@ Twoways.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -440,7 +447,6 @@ Twoways.obj: \
     "$(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" \
@@ -463,7 +469,6 @@ Twoways.obj: \
     "$(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" \
@@ -472,6 +477,7 @@ Twoways.obj: \
     "$(includedir)\Ice\SliceChecksumDict.h" \
     "$(includedir)\Ice\Service.h" \
     "$(includedir)\Ice\RegisterPlugins.h" \
+    "$(includedir)\Ice\Comparable.h" \
     "$(top_srcdir)\test\include\TestCommon.h" \
     "$(includedir)\IceUtil\IceUtil.h" \
     "$(includedir)\IceUtil\CtrlCHandler.h" \
@@ -495,6 +501,7 @@ Oneways.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -503,6 +510,7 @@ Oneways.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -543,7 +551,7 @@ Oneways.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -557,6 +565,7 @@ Oneways.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -568,7 +577,6 @@ Oneways.obj: \
     "$(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" \
@@ -591,7 +599,6 @@ Oneways.obj: \
     "$(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" \
@@ -623,6 +630,7 @@ TwowaysAMI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -631,6 +639,7 @@ TwowaysAMI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -671,7 +680,7 @@ TwowaysAMI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -685,6 +694,7 @@ TwowaysAMI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -696,7 +706,6 @@ TwowaysAMI.obj: \
     "$(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" \
@@ -719,7 +728,6 @@ TwowaysAMI.obj: \
     "$(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" \
@@ -751,6 +759,7 @@ OnewaysAMI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -759,6 +768,7 @@ OnewaysAMI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -799,7 +809,7 @@ OnewaysAMI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -813,6 +823,7 @@ OnewaysAMI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -824,7 +835,6 @@ OnewaysAMI.obj: \
     "$(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" \
@@ -847,7 +857,6 @@ OnewaysAMI.obj: \
     "$(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" \
@@ -879,6 +888,7 @@ BatchOneways.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -887,6 +897,7 @@ BatchOneways.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -927,7 +938,7 @@ BatchOneways.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -941,6 +952,7 @@ BatchOneways.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -952,7 +964,6 @@ BatchOneways.obj: \
     "$(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" \
@@ -975,7 +986,6 @@ BatchOneways.obj: \
     "$(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" \
@@ -1007,6 +1017,7 @@ BatchOnewaysAMI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1015,6 +1026,7 @@ BatchOnewaysAMI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1055,7 +1067,7 @@ BatchOnewaysAMI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1069,6 +1081,7 @@ BatchOnewaysAMI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1080,7 +1093,6 @@ BatchOnewaysAMI.obj: \
     "$(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" \
@@ -1103,7 +1115,6 @@ BatchOnewaysAMI.obj: \
     "$(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" \
@@ -1135,6 +1146,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1143,6 +1155,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1183,7 +1196,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1197,6 +1210,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1208,7 +1222,6 @@ TestI.obj: \
     "$(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" \
@@ -1231,7 +1244,6 @@ TestI.obj: \
     "$(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" \
@@ -1264,6 +1276,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1272,6 +1285,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1312,7 +1326,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1326,6 +1340,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1337,7 +1352,6 @@ Server.obj: \
     "$(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" \
@@ -1360,7 +1374,6 @@ Server.obj: \
     "$(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" \
@@ -1391,6 +1404,7 @@ TestAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1399,6 +1413,7 @@ TestAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1433,7 +1448,7 @@ TestAMD.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1442,6 +1457,7 @@ TestAMD.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1449,7 +1465,6 @@ TestAMD.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -1474,6 +1489,7 @@ TestAMDI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1482,6 +1498,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1522,7 +1539,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1536,6 +1553,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1547,7 +1565,6 @@ TestAMDI.obj: \
     "$(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" \
@@ -1570,7 +1587,6 @@ TestAMDI.obj: \
     "$(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" \
@@ -1603,6 +1619,7 @@ ServerAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1611,6 +1628,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1651,7 +1669,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1665,6 +1683,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1676,7 +1695,6 @@ ServerAMD.obj: \
     "$(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" \
@@ -1699,7 +1717,6 @@ ServerAMD.obj: \
     "$(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" \
@@ -1732,6 +1749,7 @@ Collocated.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1740,6 +1758,7 @@ Collocated.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1780,7 +1799,7 @@ Collocated.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1794,6 +1813,7 @@ Collocated.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1805,7 +1825,6 @@ Collocated.obj: \
     "$(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" \
@@ -1828,7 +1847,6 @@ Collocated.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/operations/AllTests.cpp b/cpp/test/Ice/operations/AllTests.cpp
index f4b3a712d6e..45e9f666ba3 100644
--- a/cpp/test/Ice/operations/AllTests.cpp
+++ b/cpp/test/Ice/operations/AllTests.cpp
@@ -14,45 +14,45 @@
 
 using namespace std;
 
-Test::MyClassPrx
+Test::MyClassPrxPtr
 allTests(const Ice::CommunicatorPtr& communicator)
 {
     string ref = "test:default -p 12010";
-    Ice::ObjectPrx base = communicator->stringToProxy(ref);
-    Test::MyClassPrx cl = Test::MyClassPrx::checkedCast(base);
-    Test::MyDerivedClassPrx derived = Test::MyDerivedClassPrx::checkedCast(cl);
+    Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
+    Test::MyClassPrxPtr cl = ICE_CHECKED_CAST(Test::MyClassPrx, base);
+    Test::MyDerivedClassPrxPtr derived = ICE_CHECKED_CAST(Test::MyDerivedClassPrx, cl);
 
     cout << "testing twoway operations... " << flush;
-    void twoways(const Ice::CommunicatorPtr&, const Test::MyClassPrx&);
+    void twoways(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr&);
     twoways(communicator, cl);
     twoways(communicator, derived);
     derived->opDerived();
     cout << "ok" << endl;
 
     cout << "testing oneway operations... " << flush;
-    void oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrx&);
+    void oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr&);
     oneways(communicator, cl);
     cout << "ok" << endl;
 
     cout << "testing twoway operations with AMI... " << flush;
-    void twowaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx&);
+    void twowaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr&);
     twowaysAMI(communicator, cl);
     twowaysAMI(communicator, derived);
     cout << "ok" << endl;
 
     cout << "testing oneway operations with AMI... " << flush;
-    void onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx&);
+    void onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr&);
     onewaysAMI(communicator, cl);
     cout << "ok" << endl;
 
     cout << "testing batch oneway operations... " << flush;
-    void batchOneways(const Test::MyClassPrx&);
+    void batchOneways(const Test::MyClassPrxPtr&);
     batchOneways(cl);
     batchOneways(derived);
     cout << "ok" << endl;
 
     cout << "testing batch AMI oneway operations... " << flush;
-    void batchOnewaysAMI(const Test::MyClassPrx&);
+    void batchOnewaysAMI(const Test::MyClassPrxPtr&);
     batchOnewaysAMI(cl);
     batchOnewaysAMI(derived);
     cout << "ok" << endl;
diff --git a/cpp/test/Ice/operations/BatchOneways.cpp b/cpp/test/Ice/operations/BatchOneways.cpp
index 8d6bfffad21..05e2f391dde 100644
--- a/cpp/test/Ice/operations/BatchOneways.cpp
+++ b/cpp/test/Ice/operations/BatchOneways.cpp
@@ -39,7 +39,11 @@ public:
 
         if(_size + request.getSize() > 25000)
         {
+#ifdef ICE_CPP11_MAPPING
+            request.getProxy()->ice_flushBatchRequests_async();
+#else
             request.getProxy()->begin_ice_flushBatchRequests();
+#endif
             _size = 18; // header
         }
 
@@ -70,16 +74,16 @@ private:
     int _size;
     int _lastRequestSize;
 };
-typedef IceUtil::Handle<BatchRequestInterceptorI> BatchRequestInterceptorIPtr;
+ICE_DEFINE_PTR(BatchRequestInterceptorIPtr, BatchRequestInterceptorI);
 
 }
 
 void
-batchOneways(const Test::MyClassPrx& p)
+batchOneways(const Test::MyClassPrxPtr& p)
 {
     const Test::ByteS bs1(10  * 1024);
 
-    Test::MyClassPrx batch = Test::MyClassPrx::uncheckedCast(p->ice_batchOneway());
+    Test::MyClassPrxPtr batch = ICE_UNCHECKED_CAST(Test::MyClassPrx, p->ice_batchOneway());
 
     batch->ice_flushBatchRequests(); // Empty flush
 
@@ -106,8 +110,8 @@ batchOneways(const Test::MyClassPrx& p)
 
     if(batch->ice_getConnection())
     {
-        Test::MyClassPrx batch1 = Test::MyClassPrx::uncheckedCast(p->ice_batchOneway());
-        Test::MyClassPrx batch2 = Test::MyClassPrx::uncheckedCast(p->ice_batchOneway());
+        Test::MyClassPrxPtr batch1 = ICE_UNCHECKED_CAST(Test::MyClassPrx, p->ice_batchOneway());
+        Test::MyClassPrxPtr batch2 = ICE_UNCHECKED_CAST(Test::MyClassPrx, p->ice_batchOneway());
 
         batch1->ice_ping();
         batch2->ice_ping();
@@ -127,7 +131,7 @@ batchOneways(const Test::MyClassPrx& p)
 
     Ice::Identity identity;
     identity.name = "invalid";
-    Ice::ObjectPrx batch3 = batch->ice_identity(identity);
+    Ice::ObjectPrxPtr batch3 = batch->ice_identity(identity);
     batch3->ice_ping();
     batch3->ice_flushBatchRequests();
 
@@ -141,9 +145,9 @@ batchOneways(const Test::MyClassPrx& p)
     {
         Ice::InitializationData initData;
         initData.properties = p->ice_getCommunicator()->getProperties()->clone();
-        BatchRequestInterceptorIPtr interceptor = new BatchRequestInterceptorI;
+        BatchRequestInterceptorIPtr interceptor = ICE_MAKE_SHARED(BatchRequestInterceptorI);
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
         // Ensure lambda factory method works.
         initData.batchRequestInterceptor = Ice::newBatchRequestInterceptor(
             [=](const Ice::BatchRequest& request, int count, int size)
@@ -155,8 +159,8 @@ batchOneways(const Test::MyClassPrx& p)
 #endif
         Ice::CommunicatorPtr ic = Ice::initialize(initData);
 
-        Test::MyClassPrx batch =
-            Test::MyClassPrx::uncheckedCast(ic->stringToProxy(p->ice_toString()))->ice_batchOneway();
+        Test::MyClassPrxPtr batch =
+            ICE_UNCHECKED_CAST(Test::MyClassPrx, ic->stringToProxy(p->ice_toString()))->ice_batchOneway();
 
         test(interceptor->count() == 0);
         batch->ice_ping();
diff --git a/cpp/test/Ice/operations/BatchOnewaysAMI.cpp b/cpp/test/Ice/operations/BatchOnewaysAMI.cpp
index 876a60eac52..ed7ad110e23 100644
--- a/cpp/test/Ice/operations/BatchOnewaysAMI.cpp
+++ b/cpp/test/Ice/operations/BatchOnewaysAMI.cpp
@@ -91,11 +91,67 @@ public:
 }
 
 void
-batchOnewaysAMI(const Test::MyClassPrx& p)
+batchOnewaysAMI(const Test::MyClassPrxPtr& p)
 {
     const Test::ByteS bs1(10  * 1024);
+    Test::MyClassPrxPtr batch = ICE_UNCHECKED_CAST(Test::MyClassPrx, p->ice_batchOneway());
+#ifdef ICE_CPP11_MAPPING
+    
+    promise<void> prom;
+    batch->ice_flushBatchRequests_async(nullptr,
+        [&](bool sentSynchronously)
+        {
+            test(sentSynchronously);
+            prom.set_value();
+        }); // Empty flush
+    prom.get_future().get();
+
+    for(int i = 0 ; i < 30 ; ++i)
+    {
+        batch->opByteSOneway_async(bs1, nullptr, [](exception_ptr){ test(false); });
+    }
+
+    int count = 0;
+    while(count < 27) // 3 * 9 requests auto-flushed.
+    {
+        count += p->opByteSOnewayCallCount();
+        IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(10));
+    }
+
+    if(batch->ice_getConnection())
+    {
+        shared_ptr<Test::MyClassPrx> batch1 = Ice::uncheckedCast<Test::MyClassPrx>(p->ice_batchOneway());
+        shared_ptr<Test::MyClassPrx> batch2 = Ice::uncheckedCast<Test::MyClassPrx>(p->ice_batchOneway());
+
+        batch1->ice_ping_async().get();
+        batch2->ice_ping_async().get();
+        batch1->ice_flushBatchRequests_async().get();
+        batch1->ice_getConnection()->close(false);
+        batch1->ice_ping_async().get();
+        batch2->ice_ping_async().get();
+
+        batch1->ice_getConnection();
+        batch2->ice_getConnection();
+
+        batch1->ice_ping_async().get();
+        batch1->ice_getConnection()->close(false);
+
+        batch1->ice_ping_async().get();
+        batch2->ice_ping_async().get();
+    }
 
-    Test::MyClassPrx batch = Test::MyClassPrx::uncheckedCast(p->ice_batchOneway());
+    Ice::Identity identity;
+    identity.name = "invalid";
+    auto batch3 = batch->ice_identity(identity);
+    batch3->ice_ping_async();
+    batch3->ice_flushBatchRequests_async().get();
+
+    // Make sure that a bogus batch request doesn't cause troubles to other ones.
+    batch3->ice_ping_async();
+    batch->ice_ping_async();
+    batch->ice_flushBatchRequests_async().get();
+    batch->ice_ping_async();
+#else
     batch->end_ice_flushBatchRequests(batch->begin_ice_flushBatchRequests()); // Empty flush
 
     test(batch->begin_ice_flushBatchRequests()->isSent()); // Empty flush
@@ -149,4 +205,5 @@ batchOnewaysAMI(const Test::MyClassPrx& p)
     batch->begin_ice_ping();
     batch->end_ice_flushBatchRequests(batch->begin_ice_flushBatchRequests());
     batch->begin_ice_ping();
+#endif
 }
diff --git a/cpp/test/Ice/operations/Client.cpp b/cpp/test/Ice/operations/Client.cpp
index 0d97cd27f87..fea475d97df 100644
--- a/cpp/test/Ice/operations/Client.cpp
+++ b/cpp/test/Ice/operations/Client.cpp
@@ -18,8 +18,8 @@ using namespace std;
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::InitializationData&)
 {
-    Test::MyClassPrx allTests(const Ice::CommunicatorPtr&);
-    Test::MyClassPrx myClass = allTests(communicator);
+    Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr&);
+    Test::MyClassPrxPtr myClass = allTests(communicator);
 
 #ifndef ICE_OS_WINRT
     cout << "testing server shutdown... " << flush;
diff --git a/cpp/test/Ice/operations/Collocated.cpp b/cpp/test/Ice/operations/Collocated.cpp
index 0ce4663448c..d7efae4e203 100644
--- a/cpp/test/Ice/operations/Collocated.cpp
+++ b/cpp/test/Ice/operations/Collocated.cpp
@@ -22,12 +22,12 @@ run(int, char**, const Ice::CommunicatorPtr& communicator,
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     communicator->getProperties()->setProperty("TestAdapter.AdapterId", "test");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    Ice::ObjectPrx prx = adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
+    Ice::ObjectPrxPtr prx = adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test"));
     //adapter->activate(); // Don't activate OA to ensure collocation is used.
 
     test(!prx->ice_getConnection());
 
-    Test::MyClassPrx allTests(const Ice::CommunicatorPtr&);
+    Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr&);
     allTests(communicator);
 
     return EXIT_SUCCESS;
diff --git a/cpp/test/Ice/operations/Makefile.mak b/cpp/test/Ice/operations/Makefile.mak
index d4d9038ca2f..dd451321bf9 100644
--- a/cpp/test/Ice/operations/Makefile.mak
+++ b/cpp/test/Ice/operations/Makefile.mak
@@ -64,7 +64,7 @@ OBJS		= $(COBJS) \
 
 !include $(top_srcdir)/config/Make.rules.mak
 
-CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -Zm200 -bigobj
+CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN -Zm200 -bigobj /wd4503
 
 !if "$(GENERATE_PDB)" == "yes"
 CPDBFLAGS        = /pdb:$(CLIENT).pdb
diff --git a/cpp/test/Ice/operations/Oneways.cpp b/cpp/test/Ice/operations/Oneways.cpp
index 47353bb3a10..4d86964b59f 100644
--- a/cpp/test/Ice/operations/Oneways.cpp
+++ b/cpp/test/Ice/operations/Oneways.cpp
@@ -14,9 +14,9 @@
 using namespace std;
 
 void
-oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy)
+oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy)
 {
-    Test::MyClassPrx p = Test::MyClassPrx::uncheckedCast(proxy->ice_oneway());
+    Test::MyClassPrxPtr p = ICE_UNCHECKED_CAST(Test::MyClassPrx, proxy->ice_oneway());
     
     {
         p->ice_ping();
@@ -28,7 +28,11 @@ oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy)
             p->ice_isA("dummy");
             test(false);
         }
+#ifdef ICE_CPP11_MAPPING
+        catch(const IceUtil::IllegalArgumentException&)
+#else
         catch(const Ice::TwowayOnlyException&)
+#endif
         {
         }
     }
@@ -39,7 +43,11 @@ oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy)
             p->ice_id();
             test(false);
         }
+#ifdef ICE_CPP11_MAPPING
+        catch(const IceUtil::IllegalArgumentException&)
+#else
         catch(const Ice::TwowayOnlyException&)
+#endif
         {
         }
     }
@@ -50,7 +58,11 @@ oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy)
             p->ice_ids();
             test(false);
         }
+#ifdef ICE_CPP11_MAPPING
+        catch(const IceUtil::IllegalArgumentException&)
+#else
         catch(const Ice::TwowayOnlyException&)
+#endif
         {
         }
     }    
@@ -75,7 +87,11 @@ oneways(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy)
             p->opByte(Ice::Byte(0xff), Ice::Byte(0x0f), b);
             test(false);
         }
+#ifdef ICE_CPP11_MAPPING
+        catch(const IceUtil::IllegalArgumentException&)
+#else
         catch(const Ice::TwowayOnlyException&)
+#endif
         {
         }
     }
diff --git a/cpp/test/Ice/operations/OnewaysAMI.cpp b/cpp/test/Ice/operations/OnewaysAMI.cpp
index ee48f534b0b..c4342818256 100644
--- a/cpp/test/Ice/operations/OnewaysAMI.cpp
+++ b/cpp/test/Ice/operations/OnewaysAMI.cpp
@@ -80,22 +80,43 @@ typedef IceUtil::Handle<Callback> CallbackPtr;
 }
 
 void
-onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy)
+onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrxPtr& proxy)
 {
-    Test::MyClassPrx p = Test::MyClassPrx::uncheckedCast(proxy->ice_oneway());
+    Test::MyClassPrxPtr p = ICE_UNCHECKED_CAST(Test::MyClassPrx, proxy->ice_oneway());
 
     {
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->ice_ping_async(
+            nullptr,
+            [](exception_ptr)
+            {
+                test(false);
+            },
+            [&](bool sent)
+            {
+                cb->sent(sent);
+            });
+#else
         Ice::Callback_Object_ice_pingPtr callback =
             Ice::newCallback_Object_ice_ping(cb, &Callback::noException, &Callback::sent);
         p->begin_ice_ping(callback);
+#endif
         cb->check();
     }
 
     {
         try
         {
+#ifdef ICE_CPP11_MAPPING
+            p->ice_isA_async(Test::MyClass::ice_staticId(), 
+                [&](bool)
+                {
+                    test(false);
+                });
+#else
             p->begin_ice_isA(Test::MyClass::ice_staticId());
+#endif
             test(false);
         }
         catch(const IceUtil::IllegalArgumentException&)
@@ -106,7 +127,15 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy)
     {
         try
         {
+#ifdef ICE_CPP11_MAPPING
+            p->ice_id_async( 
+                [&](string)
+                {
+                    test(false);
+                });
+#else
             p->begin_ice_id();
+#endif
             test(false);
         }
         catch(const IceUtil::IllegalArgumentException&)
@@ -117,7 +146,14 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy)
     {
         try
         {
+#ifdef ICE_CPP11_MAPPING
+            p->ice_ids_async( 
+                [&](vector<string>)
+                {
+                });
+#else
             p->begin_ice_ids();
+#endif
             test(false);
         }
         catch(const IceUtil::IllegalArgumentException&)
@@ -127,51 +163,104 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy)
 
     {
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opVoid_async(
+            nullptr,
+            [](exception_ptr)
+            {
+                test(false);
+            },
+            [&](bool sent)
+            {
+                cb->sent(sent);
+            });
+#else
         Test::Callback_MyClass_opVoidPtr callback =
             Test::newCallback_MyClass_opVoid(cb, &Callback::noException, &Callback::sent);
         p->begin_opVoid(callback);
+#endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opIdempotent_async(
+            nullptr,
+            [](exception_ptr)
+            {
+                test(false);
+            },
+            [&](bool sent)
+            {
+                cb->sent(sent);
+            });
+#else
         Test::Callback_MyClass_opIdempotentPtr callback =
             Test::newCallback_MyClass_opIdempotent(cb, &Callback::noException, &Callback::sent);
         p->begin_opIdempotent(callback);
+#endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opNonmutating_async(
+            nullptr,
+            [](exception_ptr)
+            {
+                test(false);
+            },
+            [&](bool sent)
+            {
+                cb->sent(sent);
+            });
+#else
         Test::Callback_MyClass_opNonmutatingPtr callback =
             Test::newCallback_MyClass_opNonmutating(cb, &Callback::noException, &Callback::sent);
         p->begin_opNonmutating(callback);
+#endif
         cb->check();
     }
 
     {
         try
         {
+#ifdef ICE_CPP11_MAPPING
+            p->opByte_async(Ice::Byte(0xff), Ice::Byte(0x0f),
+                [](Ice::Byte, Ice::Byte)
+                {
+                    test(false);
+                });
+#else
             p->begin_opByte(Ice::Byte(0xff), Ice::Byte(0x0f));
+#endif
             test(false);
         }
         catch(const IceUtil::IllegalArgumentException&)
         {
         }
     }
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
+#   ifndef ICE_CPP11_MAPPING
     {
         CallbackPtr cb = new Callback;
         p->begin_ice_ping(nullptr, 
                           [=](const Ice::Exception& ex){ cb->noException(ex); },
                           [=](bool sent){ cb->sent(sent); });
         cb->check();
-    }
 
+    }
+#   endif
     {
         try
         {
+#   ifdef ICE_CPP11_MAPPING
+            p->ice_isA_async(Test::MyClass::ice_staticId());
+#   else
             p->begin_ice_isA(Test::MyClass::ice_staticId(), [=](bool){ test(false); });
+#   endif
             test(false);
         }
         catch(const IceUtil::IllegalArgumentException&)
@@ -182,7 +271,11 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy)
     {
         try
         {
+#   ifdef ICE_CPP11_MAPPING
+            p->ice_id_async();
+#   else
             p->begin_ice_id([=](const string&){ test(false); });
+#   endif
             test(false);
         }
         catch(const IceUtil::IllegalArgumentException&)
@@ -193,7 +286,11 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy)
     {
         try
         {
+#   ifdef ICE_CPP11_MAPPING
+            p->ice_ids_async();
+#   else
             p->begin_ice_ids([=](const Ice::StringSeq&){ test(false); });
+#   endif
             test(false);
         }
         catch(const IceUtil::IllegalArgumentException&)
@@ -201,6 +298,7 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy)
         }
     }
 
+#   ifndef ICE_CPP11_MAPPING
     {
         CallbackPtr cb = new Callback;
         p->begin_opVoid(nullptr, 
@@ -235,5 +333,6 @@ onewaysAMI(const Ice::CommunicatorPtr&, const Test::MyClassPrx& proxy)
         {
         }
     }
+#   endif
 #endif
 }
diff --git a/cpp/test/Ice/operations/Server.cpp b/cpp/test/Ice/operations/Server.cpp
index 6d589352eb4..19e60a7d2df 100644
--- a/cpp/test/Ice/operations/Server.cpp
+++ b/cpp/test/Ice/operations/Server.cpp
@@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
+    adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test"));
     adapter->activate();
     TEST_READY
     communicator->waitForShutdown();
diff --git a/cpp/test/Ice/operations/ServerAMD.cpp b/cpp/test/Ice/operations/ServerAMD.cpp
index e42550569fa..76f24555c2b 100644
--- a/cpp/test/Ice/operations/ServerAMD.cpp
+++ b/cpp/test/Ice/operations/ServerAMD.cpp
@@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
+    adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test"));
     adapter->activate();
     TEST_READY
     communicator->waitForShutdown();
diff --git a/cpp/test/Ice/operations/TestAMDI.cpp b/cpp/test/Ice/operations/TestAMDI.cpp
index 5b64dbfb58b..770e9570e04 100644
--- a/cpp/test/Ice/operations/TestAMDI.cpp
+++ b/cpp/test/Ice/operations/TestAMDI.cpp
@@ -13,58 +13,919 @@
 #include <functional>
 #include <iterator>
 
+using namespace Ice;
+using namespace Test;
+
+using namespace std;
+
+MyDerivedClassI::MyDerivedClassI() : _opByteSOnewayCallCount(0)
+{
+}
+
+bool
+MyDerivedClassI::ice_isA(const std::string& id, const Ice::Current& current) const
+{
+    test(current.mode == ICE_ENUM(OperationMode, Nonmutating));
+#ifdef ICE_CPP11_MAPPING
+    return Test::MyDerivedClassDisp::ice_isA(id, current);
+#else
+    return Test::MyDerivedClass::ice_isA(id, current);
+#endif
+}
+
+void
+MyDerivedClassI::ice_ping(const Ice::Current& current) const
+{
+    test(current.mode == ICE_ENUM(OperationMode, Nonmutating));
+#ifdef ICE_CPP11_MAPPING
+    Test::MyDerivedClassDisp::ice_ping(current);
+#else
+    Test::MyDerivedClass::ice_ping(current);
+#endif
+}
+
+std::vector<std::string>
+MyDerivedClassI::ice_ids(const Ice::Current& current) const
+{
+    test(current.mode == ICE_ENUM(OperationMode, Nonmutating));
+#ifdef ICE_CPP11_MAPPING
+    return Test::MyDerivedClassDisp::ice_ids(current);
+#else
+    return Test::MyDerivedClass::ice_ids(current);
+#endif
+}
+
+const std::string&
+MyDerivedClassI::ice_id(const Ice::Current& current) const
+{
+    test(current.mode == ICE_ENUM(OperationMode, Nonmutating));
+#ifdef ICE_CPP11_MAPPING
+    return Test::MyDerivedClassDisp::ice_id(current);
+#else
+    return Test::MyDerivedClass::ice_id(current);
+#endif
+}
+
+#ifdef ICE_CPP11_MAPPING
+
 class Thread_opVoid : public IceUtil::Thread
 {
 public:
 
-    Thread_opVoid(const Test::AMD_MyClass_opVoidPtr& cb) :
-        _cb(cb)
+    Thread_opVoid(function<void ()> response) :
+        _response(move(response))
     {
     }
 
     virtual void run()
     {
-        _cb->ice_response();
+        _response();
     }
 
 private:
 
-    const Test::AMD_MyClass_opVoidPtr _cb;
+    function<void ()> _response;
 };
 
-MyDerivedClassI::MyDerivedClassI() : _opByteSOnewayCallCount(0)
+void
+MyDerivedClassI::shutdown_async(function<void ()> response,
+                                function<void (const exception_ptr&)>, 
+                                const Ice::Current& current)
 {
+    {
+        IceUtil::Mutex::Lock sync(_opVoidMutex);
+        if(_opVoidThread)
+        {
+            _opVoidThread->getThreadControl().join();
+            _opVoidThread = 0;
+        }
+    }
+
+    current.adapter->getCommunicator()->shutdown();
+    response();
 }
 
-bool
-MyDerivedClassI::ice_isA(const std::string& id, const Ice::Current& current) const
+void
+MyDerivedClassI::delay_async(Ice::Int ms, function<void ()> response,
+                             function<void (const exception_ptr&)>,
+                             const Ice::Current&)
 {
-    test(current.mode == Ice::Nonmutating);
-    return Test::MyDerivedClass::ice_isA(id, current);
+    IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(ms));
+    response();
 }
 
 void
-MyDerivedClassI::ice_ping(const Ice::Current& current) const
+MyDerivedClassI::opVoid_async(function<void ()> response,
+                              function<void (const exception_ptr&)>,
+                              const Ice::Current& current)
 {
-    test(current.mode == Ice::Nonmutating);
-    Test::MyDerivedClass::ice_ping(current);
+    test(current.mode == OperationMode::Normal);
+
+    IceUtil::Mutex::Lock sync(_opVoidMutex);
+    if(_opVoidThread)
+    {
+        _opVoidThread->getThreadControl().join();
+        _opVoidThread = 0;
+    }
+
+    _opVoidThread = new Thread_opVoid(response);
+    _opVoidThread->start();
 }
 
-std::vector<std::string>
-MyDerivedClassI::ice_ids(const Ice::Current& current) const
+
+void 
+MyDerivedClassI::opByte_async(Ice::Byte p1,
+                              Ice::Byte p2,
+                              function<void (Ice::Byte, Ice::Byte)> response,
+                              function<void (const exception_ptr&)>,
+                              const Ice::Current&)
 {
-    test(current.mode == Ice::Nonmutating);
-    return Test::MyDerivedClass::ice_ids(current);
+    response(p1, p1 ^ p2);
 }
 
-const std::string&
-MyDerivedClassI::ice_id(const Ice::Current& current) const
+void 
+MyDerivedClassI::opBool_async(bool p1,
+                              bool p2,
+                              function<void (bool, bool)> response,
+                              function<void (const exception_ptr&)>,
+                              const Ice::Current&)
 {
-    test(current.mode == Ice::Nonmutating);
-    return Test::MyDerivedClass::ice_id(current);
+    response(p2, p1);
+}
+
+
+void
+MyDerivedClassI::opShortIntLong_async(short p1,
+                                      int p2,
+                                      long long int p3,
+                                      function<void (long long int, short, int, long long int)> response,
+                                      function<void (const exception_ptr&)>,
+                                      const Ice::Current&)
+{
+    response(p3, p1, p2, p3);
+}
+
+
+void
+MyDerivedClassI::opFloatDouble_async(float p1,
+                                     double p2,
+                                     function<void (double, float, double)> response,
+                                     function<void (const exception_ptr&)>,
+                                     const Ice::Current&)
+{
+    response(p2, p1, p2);
+}
+
+void
+MyDerivedClassI::opString_async(const string& p1,
+                                const string& p2,
+                                function<void (const string&, const string&)> response,
+                                function<void (const exception_ptr&)>,
+                                const Ice::Current&)
+{
+    response(p1 + " " + p2, p2 + " " + p1);
+}
+
+
+void
+MyDerivedClassI::opMyEnum_async(Test::MyEnum p1,
+                                function<void (Test::MyEnum, Test::MyEnum)> response,
+                                function<void (const exception_ptr&)>,
+                                const Ice::Current&)
+{
+    response(MyEnum::enum3, p1);
+}
+
+void
+MyDerivedClassI::opMyClass_async(const shared_ptr<Test::MyClassPrx>& p1,
+                                 function<void (const shared_ptr<Test::MyClassPrx>&,
+                                                const shared_ptr<Test::MyClassPrx>&,
+                                                const shared_ptr<Test::MyClassPrx>&)> response,
+                                 function<void (const exception_ptr&)>,
+                                 const Ice::Current& current)
+{
+    auto p2 = p1;
+    auto p3 = uncheckedCast<Test::MyClassPrx>(current.adapter->createProxy(
+                            current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity")));
+    response(uncheckedCast<Test::MyClassPrx>(current.adapter->createProxy(current.id)), p2, p3);
 }
 
 void
+MyDerivedClassI::opStruct_async(const Test::Structure& p1, 
+                                const Test::Structure& p2,
+                                function<void (const Test::Structure&, const Test::Structure&)> response,
+                                function<void (const exception_ptr&)>,
+                                const Ice::Current&)
+{
+    Test::Structure p3 = p1;
+    p3.s.s = "a new string";
+    response(p2, p3);
+}
+
+void
+MyDerivedClassI::opByteS_async(const Test::ByteS& p1,
+                               const Test::ByteS& p2,
+                               function<void (const Test::ByteS&, const Test::ByteS&)> response,
+                               function<void (const exception_ptr&)>,
+                               const Ice::Current&)
+{
+    Test::ByteS p3;
+    p3.resize(p1.size());
+    std::reverse_copy(p1.begin(), p1.end(), p3.begin());
+    Test::ByteS r = p1;
+    std::copy(p2.begin(), p2.end(), std::back_inserter(r));
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opBoolS_async(const Test::BoolS& p1,
+                               const Test::BoolS& p2,
+                               function<void (const Test::BoolS&, const Test::BoolS&)> response,
+                               function<void (const exception_ptr&)>,
+                               const Ice::Current&)
+{
+    Test::BoolS p3 = p1;
+    std::copy(p2.begin(), p2.end(), std::back_inserter(p3));
+    Test::BoolS r;
+    r.resize(p1.size());
+    std::reverse_copy(p1.begin(), p1.end(), r.begin());
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opShortIntLongS_async(const Test::ShortS& p1,
+                                       const Test::IntS& p2,
+                                       const Test::LongS& p3,
+                                       function<void (const Test::LongS&,
+                                                      const Test::ShortS&,
+                                                      const Test::IntS&,
+                                                      const Test::LongS&)> response,
+                                       function<void (const exception_ptr&)>,
+                                       const Ice::Current&)
+{
+    Test::ShortS p4 = p1;
+    Test::IntS p5;
+    p5.resize(p2.size());
+    std::reverse_copy(p2.begin(), p2.end(), p5.begin());
+    Test::LongS p6 = p3;
+    std::copy(p3.begin(), p3.end(), std::back_inserter(p6));
+    response(p3, p4, p5, p6);
+}
+
+void
+MyDerivedClassI::opFloatDoubleS_async(const Test::FloatS& p1,
+                                      const Test::DoubleS& p2,
+                                      function<void (const Test::DoubleS&,
+                                                     const Test::FloatS&,
+                                                     const Test::DoubleS&)> response,
+                                      function<void (const exception_ptr&)>,
+                                      const Ice::Current&)
+{
+    Test::FloatS p3 = p1;
+    Test::DoubleS p4;
+    p4.resize(p2.size());
+    std::reverse_copy(p2.begin(), p2.end(), p4.begin());
+    Test::DoubleS r = p2;
+    std::copy(p1.begin(), p1.end(), std::back_inserter(r));
+    response(r, p3, p4);
+}
+
+void
+MyDerivedClassI::opStringS_async(const Test::StringS& p1,
+                                 const Test::StringS& p2,
+                                 function<void (const Test::StringS&, const Test::StringS&)> response,
+                                 function<void (const exception_ptr&)>,
+                                 const Ice::Current&)
+{
+    Test::StringS p3 = p1;
+    std::copy(p2.begin(), p2.end(), std::back_inserter(p3));
+    Test::StringS r;
+    r.resize(p1.size());
+    std::reverse_copy(p1.begin(), p1.end(), r.begin());
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opByteSS_async(const Test::ByteSS& p1,
+                                const Test::ByteSS& p2,
+                                function<void (const Test::ByteSS&, const Test::ByteSS&)> response,
+                                function<void (const exception_ptr&)>,
+                                const Ice::Current&)
+{
+    Test::ByteSS p3;
+    p3.resize(p1.size());
+    std::reverse_copy(p1.begin(), p1.end(), p3.begin());
+    Test::ByteSS r = p1;
+    std::copy(p2.begin(), p2.end(), std::back_inserter(r));
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opBoolSS_async(const Test::BoolSS& p1,
+                                const Test::BoolSS& p2,
+                                function<void (const Test::BoolSS&, const Test::BoolSS&)> response,
+                                function<void (const exception_ptr&)>,
+                                const Ice::Current&)
+{
+    auto p3 = p1;
+    std::copy(p2.begin(), p2.end(), std::back_inserter(p3));
+    Test::BoolSS r;
+    r.resize(p1.size());
+    std::reverse_copy(p1.begin(), p1.end(), r.begin());
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opShortIntLongSS_async(const Test::ShortSS& p1,
+                                        const Test::IntSS& p2,
+                                        const Test::LongSS& p3,
+                                        function<void (const Test::LongSS&,
+                                                       const Test::ShortSS&,
+                                                       const Test::IntSS&,
+                                                       const Test::LongSS&)> response,
+                                        function<void (const exception_ptr&)>,
+                                        const Ice::Current&)
+{
+    auto p4 = p1;
+    Test::IntSS p5;
+    p5.resize(p2.size());
+    std::reverse_copy(p2.begin(), p2.end(), p5.begin());
+    auto p6 = p3;
+    std::copy(p3.begin(), p3.end(), std::back_inserter(p6));
+    response(p3, p4, p5, p6);
+}
+
+void
+MyDerivedClassI::opFloatDoubleSS_async(const Test::FloatSS& p1,
+                                       const Test::DoubleSS& p2,
+                                       function<void (const Test::DoubleSS&,
+                                                      const Test::FloatSS&,
+                                                      const Test::DoubleSS&)> response,
+                                       function<void (const exception_ptr&)>,
+                                       const Ice::Current&)
+{
+    Test::FloatSS p3 = p1;
+    Test::DoubleSS p4;
+    p4.resize(p2.size());
+    std::reverse_copy(p2.begin(), p2.end(), p4.begin());
+    Test::DoubleSS r = p2;
+    std::copy(p2.begin(), p2.end(), std::back_inserter(r));
+    response(r, p3, p4);
+}
+
+void
+MyDerivedClassI::opStringSS_async(const Test::StringSS& p1,
+                                  const Test::StringSS& p2,
+                                  function<void (const Test::StringSS&, const Test::StringSS&)> response,
+                                  function<void (const exception_ptr&)>,
+                                  const Ice::Current&)
+{
+    Test::StringSS p3 = p1;
+    std::copy(p2.begin(), p2.end(), std::back_inserter(p3));
+    Test::StringSS r;
+    r.resize(p2.size());
+    std::reverse_copy(p2.begin(), p2.end(), r.begin());
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opStringSSS_async(const Test::StringSSS& p1, const Test::StringSSS& p2,
+                                   function<void (const Test::StringSSS&, const Test::StringSSS&)> response,
+                                   function<void (const exception_ptr&)>,
+                                   const Ice::Current&)
+{
+    Test::StringSSS p3 = p1;
+    std::copy(p2.begin(), p2.end(), std::back_inserter(p3));
+    Test::StringSSS r;
+    r.resize(p2.size());
+    std::reverse_copy(p2.begin(), p2.end(), r.begin());
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opByteBoolD_async(const Test::ByteBoolD& p1, const Test::ByteBoolD& p2,
+                                   function<void (const Test::ByteBoolD&, const Test::ByteBoolD&)> response,
+                                   function<void (const exception_ptr&)>,
+                                   const Ice::Current&)
+{
+    Test::ByteBoolD p3 = p1;
+    Test::ByteBoolD r = p1;
+    std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end()));
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opShortIntD_async(const Test::ShortIntD& p1, const Test::ShortIntD& p2,
+                                   function<void (const Test::ShortIntD&, const Test::ShortIntD&)> response,
+                                   function<void (const exception_ptr&)>,
+                                   const Ice::Current&)
+{
+    Test::ShortIntD p3 = p1;
+    Test::ShortIntD r = p1;
+    std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end()));
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opLongFloatD_async(const Test::LongFloatD& p1, const Test::LongFloatD& p2,
+                                    function<void (const Test::LongFloatD&, const Test::LongFloatD&)> response,
+                                    function<void (const exception_ptr&)>,
+                                    const Ice::Current&)
+{
+    Test::LongFloatD p3 = p1;
+    Test::LongFloatD r = p1;
+    std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end()));
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opStringStringD_async(const Test::StringStringD& p1, const Test::StringStringD& p2,
+                                       function<void (const Test::StringStringD&, const Test::StringStringD&)> response,
+                                       function<void (const exception_ptr&)>,
+                                       const Ice::Current&)
+{
+    Test::StringStringD p3 = p1;
+    Test::StringStringD r = p1;
+    std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end()));
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opStringMyEnumD_async(const Test::StringMyEnumD& p1, const Test::StringMyEnumD& p2,
+                                       function<void (const Test::StringMyEnumD&, const Test::StringMyEnumD&)> response,
+                                       function<void (const exception_ptr&)>,
+                                       const Ice::Current&)
+{
+    Test::StringMyEnumD p3 = p1;
+    Test::StringMyEnumD r = p1;
+    std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end()));
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opMyEnumStringD_async(const Test::MyEnumStringD& p1, const Test::MyEnumStringD& p2,
+                                       function<void (const Test::MyEnumStringD&, const Test::MyEnumStringD&)> response,
+                                       function<void (const exception_ptr&)>,
+                                       const Ice::Current&)
+{
+    Test::MyEnumStringD p3 = p1;
+    Test::MyEnumStringD r = p1;
+    std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end()));
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opMyStructMyEnumD_async(const Test::MyStructMyEnumD& p1, const Test::MyStructMyEnumD& p2,
+                                         function<void (const Test::MyStructMyEnumD&,
+                                                        const Test::MyStructMyEnumD&)> response,
+                                         function<void (const exception_ptr&)>,
+                                         const Ice::Current&)
+{
+    Test::MyStructMyEnumD p3 = p1;
+    Test::MyStructMyEnumD r = p1;
+    std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end()));
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opByteBoolDS_async(const Test::ByteBoolDS& p1,
+                                    const Test::ByteBoolDS& p2,
+                                    function<void (const Test::ByteBoolDS&, const Test::ByteBoolDS&)> response,
+                                    function<void (const exception_ptr&)>,
+                                    const Ice::Current&)
+{
+    Test::ByteBoolDS p3 = p2;
+    std::copy(p1.begin(), p1.end(), std::back_inserter(p3));
+    Test::ByteBoolDS r;
+    r.resize(p1.size());
+    std::reverse_copy(p1.begin(), p1.end(), r.begin());
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opShortIntDS_async(const Test::ShortIntDS& p1, const Test::ShortIntDS& p2,
+                                    function<void (const Test::ShortIntDS&, const Test::ShortIntDS&)> response,
+                                    function<void (const exception_ptr&)>,
+                                    const Ice::Current&)
+{
+    Test::ShortIntDS p3 = p2;
+    std::copy(p1.begin(), p1.end(), std::back_inserter(p3));
+    Test::ShortIntDS r;
+    r.resize(p1.size());
+    std::reverse_copy(p1.begin(), p1.end(), r.begin());
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opLongFloatDS_async(const Test::LongFloatDS& p1,
+                                     const Test::LongFloatDS& p2,
+                                     function<void (const Test::LongFloatDS&, const Test::LongFloatDS&)> response,
+                                     function<void (const exception_ptr&)>,
+                                     const Ice::Current&)
+{
+    Test::LongFloatDS p3 = p2;
+    std::copy(p1.begin(), p1.end(), std::back_inserter(p3));
+    Test::LongFloatDS r;
+    r.resize(p1.size());
+    std::reverse_copy(p1.begin(), p1.end(), r.begin());
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opStringStringDS_async(const Test::StringStringDS& p1,
+                                        const Test::StringStringDS& p2,
+                                        function<void (const Test::StringStringDS&, const Test::StringStringDS&)> response,
+                                        function<void (const exception_ptr&)>,
+                                        const Ice::Current&)
+{
+    Test::StringStringDS p3 = p2;
+    std::copy(p1.begin(), p1.end(), std::back_inserter(p3));
+    Test::StringStringDS r;
+    r.resize(p1.size());
+    std::reverse_copy(p1.begin(), p1.end(), r.begin());
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opStringMyEnumDS_async(const Test::StringMyEnumDS& p1,
+                                        const Test::StringMyEnumDS& p2,
+                                        function<void (const Test::StringMyEnumDS&, const Test::StringMyEnumDS&)> response,
+                                        function<void (const exception_ptr&)>,
+                                        const Ice::Current&)
+{
+    Test::StringMyEnumDS p3 = p2;
+    std::copy(p1.begin(), p1.end(), std::back_inserter(p3));
+    Test::StringMyEnumDS r;
+    r.resize(p1.size());
+    std::reverse_copy(p1.begin(), p1.end(), r.begin());
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opMyEnumStringDS_async(const Test::MyEnumStringDS& p1,
+                                        const Test::MyEnumStringDS& p2,
+                                        function<void (const Test::MyEnumStringDS&, const Test::MyEnumStringDS&)> response,
+                                        function<void (const exception_ptr&)>,
+                                        const Ice::Current&)
+{
+    Test::MyEnumStringDS p3 = p2;
+    std::copy(p1.begin(), p1.end(), std::back_inserter(p3));
+    Test::MyEnumStringDS r;
+    r.resize(p1.size());
+    std::reverse_copy(p1.begin(), p1.end(), r.begin());
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opMyStructMyEnumDS_async(const Test::MyStructMyEnumDS& p1, const Test::MyStructMyEnumDS& p2,
+                                          function<void (const Test::MyStructMyEnumDS&,
+                                                         const Test::MyStructMyEnumDS&)> response,
+                                          function<void (const exception_ptr&)>,
+                                          const Ice::Current&)
+{
+    Test::MyStructMyEnumDS p3 = p2;
+    std::copy(p1.begin(), p1.end(), std::back_inserter(p3));
+    Test::MyStructMyEnumDS r;
+    r.resize(p1.size());
+    std::reverse_copy(p1.begin(), p1.end(), r.begin());
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opByteByteSD_async(const Test::ByteByteSD& p1, const Test::ByteByteSD& p2,
+                                    function<void (const Test::ByteByteSD&, const Test::ByteByteSD&)> response,
+                                    function<void (const exception_ptr&)>,
+                                    const Ice::Current&)
+{
+    Test::ByteByteSD p3 = p2;
+    Test::ByteByteSD r;
+    std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end()));
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opBoolBoolSD_async(const Test::BoolBoolSD& p1,
+                                    const Test::BoolBoolSD& p2,
+                                    function<void (const Test::BoolBoolSD&, const Test::BoolBoolSD&)> response,
+                                    function<void (const exception_ptr&)>,
+                                    const Ice::Current&)
+{
+    Test::BoolBoolSD p3 = p2;
+    Test::BoolBoolSD r;
+    std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end()));
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opShortShortSD_async(const Test::ShortShortSD& p1,
+                                      const Test::ShortShortSD& p2,
+                                      function<void (const Test::ShortShortSD&, const Test::ShortShortSD&)> response,
+                                      function<void (const exception_ptr&)>,
+                                      const Ice::Current&)
+{
+    Test::ShortShortSD p3 = p2;
+    Test::ShortShortSD r;
+    std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end()));
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opIntIntSD_async(const Test::IntIntSD& p1,
+                                  const Test::IntIntSD& p2,
+                                  function<void (const Test::IntIntSD&, const Test::IntIntSD&)> response,
+                                  function<void (const exception_ptr&)>,
+                                  const Ice::Current&)
+{
+    Test::IntIntSD p3 = p2;
+    Test::IntIntSD r;
+    std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end()));
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opLongLongSD_async(const Test::LongLongSD& p1,
+                                    const Test::LongLongSD& p2,
+                                    function<void (const Test::LongLongSD&, const Test::LongLongSD&)> response,
+                                    function<void (const exception_ptr&)>,
+                                    const Ice::Current&)
+{
+    Test::LongLongSD p3 = p2;
+    Test::LongLongSD r;
+    std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end()));
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opStringFloatSD_async(const Test::StringFloatSD& p1,
+                                       const Test::StringFloatSD& p2,
+                                       function<void (const Test::StringFloatSD&, const Test::StringFloatSD&)> response,
+                                       function<void (const exception_ptr&)>,
+                                       const Ice::Current&)
+{
+    Test::StringFloatSD p3 = p2;
+    Test::StringFloatSD r;
+    std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end()));
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opStringDoubleSD_async(const Test::StringDoubleSD& p1,
+                                        const Test::StringDoubleSD& p2,
+                                        function<void (const Test::StringDoubleSD&,
+                                                       const Test::StringDoubleSD&)> response,
+                                        function<void (const exception_ptr&)>,
+                                        const Ice::Current&)
+{
+    Test::StringDoubleSD p3 = p2;
+    Test::StringDoubleSD r;
+    std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end()));
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opStringStringSD_async(const Test::StringStringSD& p1, const Test::StringStringSD& p2,
+                                        function<void (const Test::StringStringSD&,
+                                                       const Test::StringStringSD&)> response,
+                                        function<void (const exception_ptr&)>,
+                                        const Ice::Current&)
+{
+    Test::StringStringSD p3 = p2;
+    Test::StringStringSD r;
+    std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end()));
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opMyEnumMyEnumSD_async(const Test::MyEnumMyEnumSD& p1, const Test::MyEnumMyEnumSD& p2,
+                                        function<void (const Test::MyEnumMyEnumSD&,
+                                                       const Test::MyEnumMyEnumSD&)> response,
+                                        function<void (const exception_ptr&)>,
+                                        const Ice::Current&)
+{
+    Test::MyEnumMyEnumSD p3 = p2;
+    Test::MyEnumMyEnumSD r;
+    std::set_union(p1.begin(), p1.end(), p2.begin(), p2.end(), std::inserter(r, r.end()));
+    response(r, p3);
+}
+
+void
+MyDerivedClassI::opIntS_async(const Test::IntS& s, 
+                              function<void (const Test::IntS&)> response,
+                              function<void (const exception_ptr&)>,
+                              const Ice::Current&)
+{
+    Test::IntS r;
+    std::transform(s.begin(), s.end(), std::back_inserter(r), std::negate<int>());
+    response(r);
+}
+
+void
+MyDerivedClassI::opByteSOneway_async(const Test::ByteS&, function<void ()> response, function<void (const exception_ptr&)>,
+                                     const Ice::Current&)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    ++_opByteSOnewayCallCount;
+    response();
+}
+
+void
+MyDerivedClassI::opByteSOnewayCallCount_async(function<void (int)> response, function<void (const exception_ptr&)>,
+                                              const Ice::Current&)
+{
+    IceUtil::Mutex::Lock sync(_mutex);
+    response(_opByteSOnewayCallCount);
+    _opByteSOnewayCallCount = 0;
+}
+
+void
+MyDerivedClassI::opContext_async(function<void (const Ice::Context&)> response,
+                                 function<void (const exception_ptr&)>,
+                                 const Ice::Current& current)
+{
+    Test::StringStringD r = current.ctx;
+    response(r);
+}
+
+void
+MyDerivedClassI::opDoubleMarshaling_async(Ice::Double p1,
+                                          const Test::DoubleS& p2, 
+                                          function<void ()> response,
+                                          function<void (const exception_ptr&)>,
+                                          const Ice::Current&)
+{
+    Ice::Double d = 1278312346.0 / 13.0;
+    test(p1 == d);
+    for(unsigned int i = 0; i < p2.size(); ++i)
+    {
+        test(p2[i] == d);
+    }
+    response();
+}
+
+void
+MyDerivedClassI::opIdempotent_async(function<void ()> response,
+                                    function<void (const exception_ptr&)>,
+                                    const Ice::Current& current)
+{
+    test(current.mode == OperationMode::Idempotent);
+    response();
+}
+
+void
+MyDerivedClassI::opNonmutating_async(function<void ()> response,
+                                     function<void (const exception_ptr&)>,
+                                     const Ice::Current& current)
+{
+    test(current.mode == OperationMode::Nonmutating);
+    response();
+}
+
+void
+MyDerivedClassI::opDerived_async(function<void ()> response,
+                                 function<void (const exception_ptr&)>,
+                                 const Ice::Current&)
+{
+    response();
+}
+
+void
+MyDerivedClassI::opByte1_async(Ice::Byte b,
+                               function<void (Ice::Byte)> response,
+                               function<void (const exception_ptr&)>,
+                               const Ice::Current&)
+{
+    response(b);
+}
+
+void
+MyDerivedClassI::opShort1_async(Ice::Short s,
+                                function<void (Ice::Short)> response,
+                                function<void (const exception_ptr&)>,
+                                const Ice::Current&)
+{
+    response(s);
+}
+
+void
+MyDerivedClassI::opInt1_async(Ice::Int i,
+                              function<void (Ice::Int)> response,
+                              function<void (const exception_ptr&)>,
+                              const Ice::Current&)
+{
+    response(i);
+}
+
+void
+MyDerivedClassI::opLong1_async(Ice::Long l,
+                               function<void (Ice::Long)> response,
+                               function<void (const exception_ptr&)>,
+                               const Ice::Current&)
+{
+    response(l);
+}
+
+void
+MyDerivedClassI::opFloat1_async(Ice::Float f,
+                                function<void (Ice::Float)> response,
+                                function<void (const exception_ptr&)>,
+                                const Ice::Current&)
+{
+    response(f);
+}
+
+void
+MyDerivedClassI::opDouble1_async(Ice::Double d,
+                                 function<void (Ice::Double)> response,
+                                 function<void (const exception_ptr&)>,
+                                 const Ice::Current&)
+{
+    response(d);
+}
+
+void
+MyDerivedClassI::opString1_async(const string& s,
+                                 function<void (const string&)> response,
+                                 function<void (const exception_ptr&)>,
+                                 const Ice::Current&)
+{
+    response(s);
+}
+
+void
+MyDerivedClassI::opStringS1_async(const Test::StringS& seq,
+                                  function<void (const Test::StringS&)> response,
+                                  function<void (const exception_ptr&)>,
+                                  const Ice::Current&)
+{
+    response(seq);
+}
+
+void
+MyDerivedClassI::opByteBoolD1_async(const Test::ByteBoolD& dict,
+                                    function<void (const Test::ByteBoolD&)> response,
+                                    function<void (const exception_ptr&)>,
+                                    const Ice::Current&)
+{
+    response(dict);
+}
+
+void
+MyDerivedClassI::opStringS2_async(const Test::StringS& seq,
+                                  function<void (const Test::StringS&)> response,
+                                  function<void (const exception_ptr&)>,
+                                  const Ice::Current&)
+{
+    response(seq);
+}
+
+void
+MyDerivedClassI::opByteBoolD2_async(const Test::ByteBoolD& dict,
+                                    function<void (const Test::ByteBoolD&)> response,
+                                    function<void (const exception_ptr&)>,
+                                    const Ice::Current&)
+{
+    response(dict);
+}
+
+void
+MyDerivedClassI::opMyStruct1_async(const Test::MyStruct1& s,
+                                   function<void (const Test::MyStruct1&)> response,
+                                   function<void (const exception_ptr&)>,
+                                   const Ice::Current&)
+{
+    response(s);
+}
+
+void
+MyDerivedClassI::opMyClass1_async(const shared_ptr<Test::MyClass1>& c,
+                                  function<void (const shared_ptr<Test::MyClass1>&)> response,
+                                  function<void (const exception_ptr&)>,
+                                  const Ice::Current&)
+{
+    response(c);
+}
+#else
+
+class Thread_opVoid : public IceUtil::Thread
+{
+public:
+
+    Thread_opVoid(const Test::AMD_MyClass_opVoidPtr& cb) :
+        _cb(cb)
+    {
+    }
+
+    virtual void run()
+    {
+        _cb->ice_response();
+    }
+
+private:
+
+    const Test::AMD_MyClass_opVoidPtr _cb;
+};
+
+void
 MyDerivedClassI::shutdown_async(const Test::AMD_MyClass_shutdownPtr& cb, const Ice::Current& current)
 {
     {
@@ -90,7 +951,7 @@ MyDerivedClassI::delay_async(const Test::AMD_MyClass_delayPtr& cb, Ice::Int ms,
 void
 MyDerivedClassI::opVoid_async(const Test::AMD_MyClass_opVoidPtr& cb, const Ice::Current& current)
 {
-    test(current.mode == Ice::Normal);
+    test(current.mode == ICE_ENUM(OperationMode, Normal));
 
     IceUtil::Mutex::Lock sync(_opVoidMutex);
     if(_opVoidThread)
@@ -154,18 +1015,19 @@ MyDerivedClassI::opMyEnum_async(const Test::AMD_MyClass_opMyEnumPtr& cb,
                                 Test::MyEnum p1,
                                 const Ice::Current&)
 {
-    cb->ice_response(Test::enum3, p1);
+    cb->ice_response(ICE_ENUM(MyEnum, enum3), p1);
 }
 
 void
 MyDerivedClassI::opMyClass_async(const Test::AMD_MyClass_opMyClassPtr& cb,
-                                 const Test::MyClassPrx& p1,
+                                 const Test::MyClassPrxPtr& p1,
                                  const Ice::Current& current)
 {
-    Test::MyClassPrx p2 = p1;
-    Test::MyClassPrx p3 = Test::MyClassPrx::uncheckedCast(current.adapter->createProxy(
-                                        current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity")));
-    cb->ice_response(Test::MyClassPrx::uncheckedCast(current.adapter->createProxy(current.id)), p2, p3);
+    Test::MyClassPrxPtr p2 = p1;
+    Test::MyClassPrxPtr p3 = ICE_UNCHECKED_CAST(
+        Test::MyClassPrx, current.adapter->createProxy(
+            current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity")));
+    cb->ice_response(ICE_UNCHECKED_CAST(Test::MyClassPrx, current.adapter->createProxy(current.id)), p2, p3);
 }
 
 void
@@ -678,14 +1540,14 @@ MyDerivedClassI::opDoubleMarshaling_async(const Test::AMD_MyClass_opDoubleMarsha
 void
 MyDerivedClassI::opIdempotent_async(const Test::AMD_MyClass_opIdempotentPtr& cb, const Ice::Current& current)
 {
-    test(current.mode == Ice::Idempotent);
+    test(current.mode == ICE_ENUM(OperationMode, Idempotent));
     cb->ice_response();
 }
 
 void
 MyDerivedClassI::opNonmutating_async(const Test::AMD_MyClass_opNonmutatingPtr& cb, const Ice::Current& current)
 {
-    test(current.mode == Ice::Nonmutating);
+    test(current.mode == ICE_ENUM(OperationMode, Nonmutating));
     cb->ice_response();
 }
 
@@ -776,4 +1638,5 @@ void
 MyDerivedClassI::opMyClass1_async(const Test::AMD_MyDerivedClass_opMyClass1Ptr& cb, const Test::MyClass1Ptr& c, const Ice::Current&)
 {
     cb->ice_response(c);
-}
\ No newline at end of file
+}
+#endif
diff --git a/cpp/test/Ice/operations/TestAMDI.h b/cpp/test/Ice/operations/TestAMDI.h
index 1eab6d8e75c..92fdd4058f1 100644
--- a/cpp/test/Ice/operations/TestAMDI.h
+++ b/cpp/test/Ice/operations/TestAMDI.h
@@ -13,7 +13,12 @@
 #include <IceUtil/Thread.h>
 #include <TestAMD.h>
 
-class MyDerivedClassI : public Test::MyDerivedClass
+class MyDerivedClassI : 
+#ifdef ICE_CPP11_MAPPING
+    public Test::MyDerivedClassDisp
+#else
+    public Test::MyDerivedClass
+#endif
 {
 public:
     
@@ -27,6 +32,349 @@ public:
     virtual std::vector<std::string> ice_ids(const Ice::Current&) const;
     virtual const std::string& ice_id(const Ice::Current&) const;
 
+#ifdef ICE_CPP11_MAPPING
+    virtual void shutdown_async(::std::function<void ()>,
+                                ::std::function<void (const ::std::exception_ptr&)>,
+                                const Ice::Current&);
+
+    virtual void delay_async(Ice::Int,
+                             ::std::function<void ()>,
+                             ::std::function<void (const ::std::exception_ptr&)>,
+                             const Ice::Current&);
+
+    virtual void opVoid_async(::std::function<void ()>,
+                              ::std::function<void (const ::std::exception_ptr&)>,
+                              const Ice::Current&);
+
+    virtual void opByte_async(Ice::Byte, Ice::Byte,
+                              ::std::function<void (Ice::Byte, Ice::Byte)>,
+                              ::std::function<void (const ::std::exception_ptr&)>,
+                              const Ice::Current&);
+
+    virtual void opBool_async(bool, bool,
+                              ::std::function<void (bool, bool)>,
+                              ::std::function<void (const ::std::exception_ptr&)>,
+                              const Ice::Current&);
+
+    virtual void opShortIntLong_async(short, int, long long int,
+                                      ::std::function<void (long long int, short, int, long long int)>,
+                                      ::std::function<void (const ::std::exception_ptr&)>,
+                                      const Ice::Current&);
+
+    virtual void opFloatDouble_async(float, double,
+                                     ::std::function<void (double, float, double)>,
+                                     ::std::function<void (const ::std::exception_ptr&)>,
+                                     const Ice::Current&);
+
+    virtual void opString_async(const std::string&, const std::string&,
+                                ::std::function<void (const ::std::string&, const ::std::string&)>,
+                                ::std::function<void (const ::std::exception_ptr&)>,
+                                const Ice::Current&);
+
+    virtual void opMyEnum_async(Test::MyEnum,
+                                ::std::function<void (Test::MyEnum, Test::MyEnum)>,
+                                ::std::function<void (const ::std::exception_ptr&)>,
+                                const Ice::Current&);
+
+    virtual void opMyClass_async(const ::std::shared_ptr<Test::MyClassPrx>&,
+                                 ::std::function<void (const ::std::shared_ptr<Test::MyClassPrx>&,
+                                                       const ::std::shared_ptr<Test::MyClassPrx>&,
+                                                       const ::std::shared_ptr<Test::MyClassPrx>&)>,
+                                 ::std::function<void (const ::std::exception_ptr&)>,
+                                 const Ice::Current&);
+
+    virtual void opStruct_async(const Test::Structure&, const Test::Structure&,
+                                ::std::function<void (const Test::Structure&, const Test::Structure&)>,
+                                ::std::function<void (const ::std::exception_ptr&)>,
+                                const Ice::Current&);
+
+    virtual void opByteS_async(const Test::ByteS&, const Test::ByteS&,
+                               ::std::function<void (const Test::ByteS&, const Test::ByteS&)>,
+                               ::std::function<void (const ::std::exception_ptr&)>,
+                               const Ice::Current&);
+
+    virtual void opBoolS_async(const Test::BoolS&, const Test::BoolS&,
+                               ::std::function<void (const Test::BoolS&, const Test::BoolS&)>,
+                               ::std::function<void (const ::std::exception_ptr&)>,
+                               const Ice::Current&);
+
+    virtual void opShortIntLongS_async(const Test::ShortS&, const Test::IntS&, const Test::LongS&,
+                                       ::std::function<void (const Test::LongS&,
+                                                             const Test::ShortS&,
+                                                             const Test::IntS&,
+                                                             const Test::LongS&)>,
+                                       ::std::function<void (const ::std::exception_ptr&)>,
+                                       const Ice::Current&);
+
+    virtual void opFloatDoubleS_async(const Test::FloatS&, const Test::DoubleS&,
+                                      ::std::function<void (const Test::DoubleS&,
+                                                            const Test::FloatS&,
+                                                            const Test::DoubleS&)>,
+                                      ::std::function<void (const ::std::exception_ptr&)>,
+                                      const Ice::Current&);
+
+    virtual void opStringS_async(const Test::StringS&, const Test::StringS&,
+                                 ::std::function<void (const Test::StringS&, const Test::StringS&)>,
+                                 ::std::function<void (const ::std::exception_ptr&)>,
+                                 const Ice::Current&);
+
+    virtual void opByteSS_async(const Test::ByteSS&, const Test::ByteSS&,
+                                ::std::function<void (const Test::ByteSS&, const Test::ByteSS&)>,
+                                ::std::function<void (const ::std::exception_ptr&)>,
+                                const Ice::Current&);
+
+    virtual void opBoolSS_async(const Test::BoolSS&, const Test::BoolSS&,
+                                ::std::function<void (const Test::BoolSS&, const Test::BoolSS&)>,
+                                ::std::function<void (const ::std::exception_ptr&)>,
+                                const Ice::Current&);
+
+    virtual void opShortIntLongSS_async(const Test::ShortSS&, const Test::IntSS&, const Test::LongSS&,
+                                        ::std::function<void (const Test::LongSS&,
+                                                              const Test::ShortSS&,
+                                                              const Test::IntSS&,
+                                                              const Test::LongSS&)>,
+                                        ::std::function<void (const ::std::exception_ptr&)>,
+                                        const Ice::Current&);
+
+    virtual void opFloatDoubleSS_async(const Test::FloatSS&, const Test::DoubleSS&,
+                                       ::std::function<void (const Test::DoubleSS&,
+                                                             const Test::FloatSS&,
+                                                             const Test::DoubleSS&)>,
+                                       ::std::function<void (const ::std::exception_ptr&)>,
+                                       const Ice::Current&);
+
+    virtual void opStringSS_async(const Test::StringSS&, const Test::StringSS&,
+                                  ::std::function<void (const Test::StringSS&, const Test::StringSS&)>,
+                                  ::std::function<void (const ::std::exception_ptr&)>,
+                                  const Ice::Current&);
+
+    virtual void opStringSSS_async(const Test::StringSSS&, const Test::StringSSS&,
+                                   ::std::function<void (const Test::StringSSS&, const Test::StringSSS&)>,
+                                   ::std::function<void (const ::std::exception_ptr&)>,
+                                   const Ice::Current&);
+
+    virtual void opByteBoolD_async(const Test::ByteBoolD&, const Test::ByteBoolD&,
+                                   ::std::function<void (const Test::ByteBoolD&, const Test::ByteBoolD&)>,
+                                   ::std::function<void (const ::std::exception_ptr&)>,
+                                   const Ice::Current&);
+
+    virtual void opShortIntD_async(const Test::ShortIntD&, const Test::ShortIntD&,
+                                   ::std::function<void (const Test::ShortIntD&, const Test::ShortIntD&)>,
+                                   ::std::function<void (const ::std::exception_ptr&)>,
+                                   const Ice::Current&);
+
+    virtual void opLongFloatD_async(const Test::LongFloatD&, const Test::LongFloatD&,
+                                    ::std::function<void (const Test::LongFloatD&, const Test::LongFloatD&)>,
+                                    ::std::function<void (const ::std::exception_ptr&)>,
+                                    const Ice::Current&);
+
+    virtual void opStringStringD_async(const Test::StringStringD&, const Test::StringStringD&,
+                                       ::std::function<void (const Test::StringStringD&, const Test::StringStringD&)>,
+                                       ::std::function<void (const ::std::exception_ptr&)>,
+                                       const Ice::Current&);
+
+    virtual void opStringMyEnumD_async(const Test::StringMyEnumD&, const Test::StringMyEnumD&,
+                                       ::std::function<void (const Test::StringMyEnumD&, const Test::StringMyEnumD&)>,
+                                       ::std::function<void (const ::std::exception_ptr&)>,
+                                       const Ice::Current&);
+
+    virtual void opMyEnumStringD_async(const Test::MyEnumStringD&, const Test::MyEnumStringD&,
+                                       ::std::function<void (const Test::MyEnumStringD&, const Test::MyEnumStringD&)>,
+                                       ::std::function<void (const ::std::exception_ptr&)>,
+                                       const Ice::Current&);
+
+    virtual void opMyStructMyEnumD_async(const Test::MyStructMyEnumD&, const Test::MyStructMyEnumD&,
+                                         ::std::function<void (const Test::MyStructMyEnumD&,
+                                                               const Test::MyStructMyEnumD&)>,
+                                         ::std::function<void (const ::std::exception_ptr&)>,
+                                         const Ice::Current&);
+
+    virtual void opByteBoolDS_async(const Test::ByteBoolDS&, const Test::ByteBoolDS&,
+                                    ::std::function<void (const Test::ByteBoolDS&, const Test::ByteBoolDS&)>,
+                                    ::std::function<void (const ::std::exception_ptr&)>,
+                                    const Ice::Current&);
+
+    virtual void opShortIntDS_async(const Test::ShortIntDS&, const Test::ShortIntDS&,
+                                    ::std::function<void (const Test::ShortIntDS&, const Test::ShortIntDS&)>,
+                                    ::std::function<void (const ::std::exception_ptr&)>,
+                                    const Ice::Current&);
+
+    virtual void opLongFloatDS_async(const Test::LongFloatDS&, const Test::LongFloatDS&,
+                                     ::std::function<void (const Test::LongFloatDS&, const Test::LongFloatDS&)>,
+                                     ::std::function<void (const ::std::exception_ptr&)>,
+                                     const Ice::Current&);
+
+    virtual void opStringStringDS_async(const Test::StringStringDS&, const Test::StringStringDS&,
+                                        ::std::function<void (const Test::StringStringDS&, const Test::StringStringDS&)>,
+                                        ::std::function<void (const ::std::exception_ptr&)>,
+                                        const Ice::Current&);
+
+    virtual void opStringMyEnumDS_async(const Test::StringMyEnumDS&, const Test::StringMyEnumDS&,
+                                        ::std::function<void (const Test::StringMyEnumDS&,
+                                                              const Test::StringMyEnumDS&)>,
+                                        ::std::function<void (const ::std::exception_ptr&)>,
+                                        const Ice::Current&);
+
+    virtual void opMyEnumStringDS_async(const Test::MyEnumStringDS&, const Test::MyEnumStringDS&,
+                                        ::std::function<void (const Test::MyEnumStringDS&,
+                                                              const Test::MyEnumStringDS&)>,
+                                        ::std::function<void (const ::std::exception_ptr&)>,
+                                        const Ice::Current&);
+
+    virtual void opMyStructMyEnumDS_async(const Test::MyStructMyEnumDS&, const Test::MyStructMyEnumDS&,
+                                          ::std::function<void (const Test::MyStructMyEnumDS&,
+                                                                const Test::MyStructMyEnumDS&)>,
+                                          ::std::function<void (const ::std::exception_ptr&)>,
+                                          const Ice::Current&);
+
+    virtual void opByteByteSD_async(const Test::ByteByteSD&, const Test::ByteByteSD&,
+                                    ::std::function<void (const Test::ByteByteSD&, const Test::ByteByteSD&)>,
+                                    ::std::function<void (const ::std::exception_ptr&)>,
+                                    const Ice::Current&);
+
+    virtual void opBoolBoolSD_async(const Test::BoolBoolSD&, const Test::BoolBoolSD&,
+                                    ::std::function<void (const Test::BoolBoolSD&, const Test::BoolBoolSD&)>,
+                                    ::std::function<void (const ::std::exception_ptr&)>,
+                                    const Ice::Current&);
+
+    virtual void opShortShortSD_async(const Test::ShortShortSD&, const Test::ShortShortSD&,
+                                      ::std::function<void (const Test::ShortShortSD&, const Test::ShortShortSD&)>,
+                                      ::std::function<void (const ::std::exception_ptr&)>,
+                                      const Ice::Current&);
+
+    virtual void opIntIntSD_async(const Test::IntIntSD&, const Test::IntIntSD&,
+                                  ::std::function<void (const Test::IntIntSD&, const Test::IntIntSD&)>,
+                                  ::std::function<void (const ::std::exception_ptr&)>,
+                                  const Ice::Current&);
+
+    virtual void opLongLongSD_async(const Test::LongLongSD&, const Test::LongLongSD&,
+                                    ::std::function<void (const Test::LongLongSD&, const Test::LongLongSD&)>,
+                                    ::std::function<void (const ::std::exception_ptr&)>,
+                                    const Ice::Current&);
+
+    virtual void opStringFloatSD_async(const Test::StringFloatSD&, const Test::StringFloatSD&,
+                                       ::std::function<void (const Test::StringFloatSD&, const Test::StringFloatSD&)>,
+                                       ::std::function<void (const ::std::exception_ptr&)>,
+                                       const Ice::Current&);
+
+    virtual void opStringDoubleSD_async(const Test::StringDoubleSD&, const Test::StringDoubleSD&,
+                                        ::std::function<void (const Test::StringDoubleSD&,
+                                                              const Test::StringDoubleSD&)>,
+                                        ::std::function<void (const ::std::exception_ptr&)>,
+                                        const Ice::Current&);
+
+    virtual void opStringStringSD_async(const Test::StringStringSD&, const Test::StringStringSD&,
+                                        ::std::function<void (const Test::StringStringSD&,
+                                                              const Test::StringStringSD&)>,
+                                        ::std::function<void (const ::std::exception_ptr&)>,
+                                        const Ice::Current&);
+
+    virtual void opMyEnumMyEnumSD_async(const Test::MyEnumMyEnumSD&, const Test::MyEnumMyEnumSD&,
+                                        ::std::function<void (const Test::MyEnumMyEnumSD&,
+                                                              const Test::MyEnumMyEnumSD&)>,
+                                        ::std::function<void (const ::std::exception_ptr&)>,
+                                        const Ice::Current&);
+
+    virtual void opIntS_async(const Test::IntS&, 
+                              ::std::function<void (const Test::IntS&)>,
+                              ::std::function<void (const ::std::exception_ptr&)>,
+                              const Ice::Current&);
+
+    virtual void opByteSOneway_async(const Test::ByteS&,
+                                     ::std::function<void ()>,
+                                     ::std::function<void (const ::std::exception_ptr&)>,
+                                     const Ice::Current&);
+    
+    virtual void opByteSOnewayCallCount_async(::std::function<void (int)>,
+                                              ::std::function<void (const ::std::exception_ptr&)>,
+                                              const Ice::Current&);
+
+    virtual void opContext_async(::std::function<void (const Ice::Context&)>,
+                                 ::std::function<void (const ::std::exception_ptr&)>,
+                                 const Ice::Current&);
+
+    virtual void opDoubleMarshaling_async(Ice::Double, const Test::DoubleS&,
+                                          ::std::function<void ()>,
+                                          ::std::function<void (const ::std::exception_ptr&)>,
+                                          const Ice::Current&);
+
+    virtual void opIdempotent_async(::std::function<void ()>,
+                                    ::std::function<void (const ::std::exception_ptr&)>,
+                                    const Ice::Current&);
+
+    virtual void opNonmutating_async(::std::function<void ()>,
+                                     ::std::function<void (const ::std::exception_ptr&)>,
+                                     const Ice::Current&);
+
+    virtual void opDerived_async(::std::function<void ()>,
+                                 ::std::function<void (const ::std::exception_ptr&)>,
+                                 const Ice::Current&);
+
+    virtual void opByte1_async(Ice::Byte,
+                               ::std::function<void (Ice::Byte)>,
+                               ::std::function<void (const ::std::exception_ptr&)>,
+                               const Ice::Current&);
+
+    virtual void opShort1_async(Ice::Short,
+                                ::std::function<void (Ice::Short)>,
+                                ::std::function<void (const ::std::exception_ptr&)>,
+                                const Ice::Current&);
+
+    virtual void opInt1_async(Ice::Int,
+                              ::std::function<void (Ice::Int)>,
+                              ::std::function<void (const ::std::exception_ptr&)>,
+                              const Ice::Current&);
+
+    virtual void opLong1_async(Ice::Long,
+                               ::std::function<void (Ice::Long)>,
+                               ::std::function<void (const ::std::exception_ptr&)>,
+                               const Ice::Current&);
+
+    virtual void opFloat1_async(Ice::Float,
+                                ::std::function<void (Ice::Float)>,
+                                ::std::function<void (const ::std::exception_ptr&)>,
+                                const Ice::Current&);
+
+    virtual void opDouble1_async(Ice::Double,
+                                 ::std::function<void (Ice::Double)>,
+                                 ::std::function<void (const ::std::exception_ptr&)>,
+                                 const Ice::Current&);
+
+    virtual void opString1_async(const std::string&,
+                                 ::std::function<void (const ::std::string&)>,
+                                 ::std::function<void (const ::std::exception_ptr&)>,
+                                 const Ice::Current&);
+
+    virtual void opStringS1_async(const Test::StringS&,
+                                  ::std::function<void (const Test::StringS&)>,
+                                  ::std::function<void (const ::std::exception_ptr&)>,
+                                  const Ice::Current&);
+
+    virtual void opByteBoolD1_async(const Test::ByteBoolD&,
+                                    ::std::function<void (const Test::ByteBoolD&)>,
+                                    ::std::function<void (const ::std::exception_ptr&)>,
+                                    const Ice::Current&);
+    
+    virtual void opStringS2_async(const Test::StringS&,
+                                  ::std::function<void (const Test::StringS&)>,
+                                  ::std::function<void (const ::std::exception_ptr&)>,
+                                  const Ice::Current&);
+    
+    virtual void opByteBoolD2_async(const Test::ByteBoolD&,
+                                    ::std::function<void (const Test::ByteBoolD&)>,
+                                    ::std::function<void (const ::std::exception_ptr&)>,
+                                    const Ice::Current&);
+
+    virtual void opMyStruct1_async(const Test::MyStruct1&,
+                                   ::std::function<void (const Test::MyStruct1&)>,
+                                   ::std::function<void (const ::std::exception_ptr&)>,
+                                   const Ice::Current&);
+
+    virtual void opMyClass1_async(const ::std::shared_ptr<Test::MyClass1>&,
+                                  ::std::function<void (const ::std::shared_ptr<Test::MyClass1>&)>,
+                                  ::std::function<void (const ::std::exception_ptr&)>,
+                                  const Ice::Current&);
+#else
     virtual void shutdown_async(const Test::AMD_MyClass_shutdownPtr&,
                                 const Ice::Current&);
 
@@ -61,7 +409,7 @@ public:
                                 const Ice::Current&);
 
     virtual void opMyClass_async(const Test::AMD_MyClass_opMyClassPtr&,
-                                 const Test::MyClassPrx&,
+                                 const Test::MyClassPrxPtr&,
                                  const Ice::Current&);
 
     virtual void opStruct_async(const Test::AMD_MyClass_opStructPtr&,
@@ -275,6 +623,7 @@ public:
     virtual void opMyClass1_async(const Test::AMD_MyDerivedClass_opMyClass1Ptr&,
                                   const Test::MyClass1Ptr&,
                                   const Ice::Current&);
+#endif
 
 private:
     IceUtil::ThreadPtr _opVoidThread;
diff --git a/cpp/test/Ice/operations/TestI.cpp b/cpp/test/Ice/operations/TestI.cpp
index 22172068ddb..53eb7a290ad 100644
--- a/cpp/test/Ice/operations/TestI.cpp
+++ b/cpp/test/Ice/operations/TestI.cpp
@@ -14,6 +14,9 @@
 #include <functional>
 #include <iterator>
 
+using namespace Ice;
+using namespace Test;
+
 MyDerivedClassI::MyDerivedClassI() : _opByteSOnewayCallCount(0)
 {
 }
@@ -21,29 +24,45 @@ MyDerivedClassI::MyDerivedClassI() : _opByteSOnewayCallCount(0)
 bool
 MyDerivedClassI::ice_isA(const std::string& id, const Ice::Current& current) const
 {
-    test(current.mode == Ice::Nonmutating);
+    test(current.mode == ICE_ENUM(OperationMode, Nonmutating));
+#ifdef ICE_CPP11_MAPPING
+    return Test::MyDerivedClassDisp::ice_isA(id, current);
+#else
     return Test::MyDerivedClass::ice_isA(id, current);
+#endif
 }
 
 void
 MyDerivedClassI::ice_ping(const Ice::Current& current) const
 {
-    test(current.mode == Ice::Nonmutating);
-    Test::MyDerivedClass::ice_ping(current);
+    test(current.mode == ICE_ENUM(OperationMode, Nonmutating));
+#ifdef ICE_CPP11_MAPPING
+    Test::MyDerivedClassDisp::ice_ping(current);
+#else
+    Test::MyDerivedClass::ice_ping(current);    
+#endif
 }
 
 std::vector<std::string>
 MyDerivedClassI::ice_ids(const Ice::Current& current) const
 {
-    test(current.mode == Ice::Nonmutating);
+    test(current.mode == ICE_ENUM(OperationMode, Nonmutating));
+#ifdef ICE_CPP11_MAPPING
+    return Test::MyDerivedClassDisp::ice_ids(current);
+#else
     return Test::MyDerivedClass::ice_ids(current);
+#endif
 }
 
 const std::string&
 MyDerivedClassI::ice_id(const Ice::Current& current) const
 {
-    test(current.mode == Ice::Nonmutating);
+    test(current.mode == ICE_ENUM(OperationMode, Nonmutating));
+#ifdef ICE_CPP11_MAPPING
+    return Test::MyDerivedClassDisp::ice_id(current);
+#else
     return Test::MyDerivedClass::ice_id(current);
+#endif
 }
 
 void
@@ -61,7 +80,7 @@ MyDerivedClassI::delay(Ice::Int ms, const Ice::Current&)
 void
 MyDerivedClassI::opVoid(const Ice::Current& current)
 {
-    test(current.mode == Ice::Normal);
+    test(current.mode == ICE_ENUM(OperationMode, Normal));
 }
 
 Ice::Byte
@@ -127,19 +146,20 @@ MyDerivedClassI::opMyEnum(Test::MyEnum p1,
                           const Ice::Current&)
 {
     p2 = p1;
-    return Test::enum3;
+    return ICE_ENUM(MyEnum, enum3);
 }
 
-Test::MyClassPrx
-MyDerivedClassI::opMyClass(const Test::MyClassPrx& p1,
-                           Test::MyClassPrx& p2,
-                           Test::MyClassPrx& p3,
+Test::MyClassPrxPtr
+MyDerivedClassI::opMyClass(const Test::MyClassPrxPtr& p1,
+                           Test::MyClassPrxPtr& p2,
+                           Test::MyClassPrxPtr& p3,
                            const Ice::Current& current)
 {
     p2 = p1;
-    p3 = Test::MyClassPrx::uncheckedCast(current.adapter->createProxy(
+    p3 = ICE_UNCHECKED_CAST(Test::MyClassPrx,
+                            current.adapter->createProxy(
                                 current.adapter->getCommunicator()->stringToIdentity("noSuchIdentity")));
-    return Test::MyClassPrx::uncheckedCast(current.adapter->createProxy(current.id));
+    return ICE_UNCHECKED_CAST(Test::MyClassPrx, current.adapter->createProxy(current.id));
 }
 
 Test::Structure
@@ -647,13 +667,13 @@ MyDerivedClassI::opDoubleMarshaling(Ice::Double p1, const Test::DoubleS& p2, con
 void
 MyDerivedClassI::opIdempotent(const Ice::Current& current)
 {
-    test(current.mode == Ice::Idempotent);
+    test(current.mode == ICE_ENUM(OperationMode, Idempotent));
 }
 
 void
 MyDerivedClassI::opNonmutating(const Ice::Current& current)
 {
-    test(current.mode == Ice::Nonmutating);
+    test(current.mode == ICE_ENUM(OperationMode, Nonmutating));
 }
 
 void
diff --git a/cpp/test/Ice/operations/TestI.h b/cpp/test/Ice/operations/TestI.h
index 259e6ff3fc2..9a5dc24fe59 100644
--- a/cpp/test/Ice/operations/TestI.h
+++ b/cpp/test/Ice/operations/TestI.h
@@ -12,7 +12,12 @@
 
 #include <Test.h>
 
-class MyDerivedClassI : public Test::MyDerivedClass
+class MyDerivedClassI : 
+#ifdef ICE_CPP11_MAPPING
+    public Test::MyDerivedClassDisp
+#else
+    public Test::MyDerivedClass
+#endif
 {
 public:
 
@@ -65,9 +70,9 @@ public:
                                   Test::MyEnum&,
                                   const Ice::Current&);
 
-    virtual Test::MyClassPrx opMyClass(const Test::MyClassPrx&,
-                                       Test::MyClassPrx&, Test::MyClassPrx&,
-                                       const Ice::Current&);
+    virtual Test::MyClassPrxPtr opMyClass(const Test::MyClassPrxPtr&,
+                                          Test::MyClassPrxPtr&, Test::MyClassPrxPtr&,
+                                          const Ice::Current&);
 
     virtual Test::Structure opStruct(const Test::Structure&, const Test::Structure&,
                                   Test::Structure&,
diff --git a/cpp/test/Ice/operations/Twoways.cpp b/cpp/test/Ice/operations/Twoways.cpp
index 09b42901e8b..50711ad105e 100644
--- a/cpp/test/Ice/operations/Twoways.cpp
+++ b/cpp/test/Ice/operations/Twoways.cpp
@@ -30,6 +30,7 @@
 #endif
 
 using namespace std;
+using namespace Test;
 
 namespace
 {
@@ -38,37 +39,42 @@ class PerThreadContextInvokeThread : public IceUtil::Thread
 {
 public:
 
-PerThreadContextInvokeThread(const Test::MyClassPrx& proxy) : _proxy(proxy)
-{
-}
+    PerThreadContextInvokeThread(const Test::MyClassPrxPtr& proxy) :
+        _proxy(proxy)
+    {
+    }
 
-virtual void
-run()
-{
-    Ice::Context ctx = _proxy->ice_getCommunicator()->getImplicitContext()->getContext();
-    test(ctx.empty());
-    ctx["one"] = "UN";
-    _proxy->ice_getCommunicator()->getImplicitContext()->setContext(ctx);
-    test(_proxy->opContext() == ctx);
-}
+    virtual void
+    run()
+    {
+        Ice::Context ctx = _proxy->ice_getCommunicator()->getImplicitContext()->getContext();
+        test(ctx.empty());
+        ctx["one"] = "UN";
+        _proxy->ice_getCommunicator()->getImplicitContext()->setContext(ctx);
+        test(_proxy->opContext() == ctx);
+    }
 
 private:
 
-    Test::MyClassPrx _proxy;
+    Test::MyClassPrxPtr _proxy;
 };
 
 }
 
 void
-twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
+twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& p)
 {
     {
         p->ice_ping();
     }
 
     {
+#ifdef ICE_CPP11_MAPPING
+        test(Test::MyClassPrx::ice_staticId() == Test::MyClassDisp::ice_staticId());
+#else
         test(Test::MyClassPrx::ice_staticId() == Test::MyClass::ice_staticId());
-	test(Ice::ObjectPrx::ice_staticId() == Ice::Object::ice_staticId());
+#endif
+        test(Ice::ObjectPrx::ice_staticId() == Ice::Object::ice_staticId());
     }
 
     {
@@ -170,15 +176,15 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         Test::MyEnum e;
         Test::MyEnum r;
 
-        r = p->opMyEnum(Test::enum2, e);
-        test(e == Test::enum2);
-        test(r == Test::enum3);
+        r = p->opMyEnum(ICE_ENUM(MyEnum, enum2), e);
+        test(e == ICE_ENUM(MyEnum, enum2));
+        test(r == ICE_ENUM(MyEnum, enum3));
     }
 
     {
-        Test::MyClassPrx c1;
-        Test::MyClassPrx c2;
-        Test::MyClassPrx r;
+        Test::MyClassPrxPtr c1;
+        Test::MyClassPrxPtr c2;
+        Test::MyClassPrxPtr r;
 
         r = p->opMyClass(p, c1, c2);
         test(Ice::proxyIdentityAndFacetEqual(c1, p));
@@ -209,20 +215,24 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
     {
         Test::Structure si1;
         si1.p = p;
-        si1.e = Test::enum3;
+        si1.e = ICE_ENUM(MyEnum, enum3);
         si1.s.s = "abc";
         Test::Structure si2;
         si2.p = 0;
-        si2.e = Test::enum2;
+        si2.e = ICE_ENUM(MyEnum, enum2);
         si2.s.s = "def";
 
         Test::Structure so;
         Test::Structure rso = p->opStruct(si1, si2, so);
         test(rso.p == 0);
-        test(rso.e == Test::enum2);
+        test(rso.e == ICE_ENUM(MyEnum, enum2));
         test(rso.s.s == "def");
+#ifdef ICE_CPP11_MAPPING
+        test(Ice::targetEquals(so.p, p));
+#else
         test(so.p == p);
-        test(so.e == Test::enum3);
+#endif
+        test(so.e == ICE_ENUM(MyEnum, enum3));
         test(so.s.s == "a new string");
         so.p->opVoid();
     }
@@ -731,64 +741,64 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
 
     {
         Test::StringMyEnumD di1;
-        di1["abc"] = Test::enum1;
-        di1[""] = Test::enum2;
+        di1["abc"] = ICE_ENUM(MyEnum, enum1);
+        di1[""] = ICE_ENUM(MyEnum, enum2);
         Test::StringMyEnumD di2;
-        di2["abc"] = Test::enum1;
-        di2["qwerty"] = Test::enum3;
-        di2["Hello!!"] = Test::enum2;
+        di2["abc"] = ICE_ENUM(MyEnum, enum1);
+        di2["qwerty"] = ICE_ENUM(MyEnum, enum3);
+        di2["Hello!!"] = ICE_ENUM(MyEnum, enum2);
 
         Test::StringMyEnumD _do;
         Test::StringMyEnumD ro = p->opStringMyEnumD(di1, di2, _do);
 
         test(_do == di1);
         test(ro.size() == 4);
-        test(ro["abc"] == Test::enum1);
-        test(ro["qwerty"] == Test::enum3);
-        test(ro[""] == Test::enum2);
-        test(ro["Hello!!"] == Test::enum2);
+        test(ro["abc"] == ICE_ENUM(MyEnum, enum1));
+        test(ro["qwerty"] == ICE_ENUM(MyEnum, enum3));
+        test(ro[""] == ICE_ENUM(MyEnum, enum2));
+        test(ro["Hello!!"] == ICE_ENUM(MyEnum, enum2));
     }
 
     {
         Test::MyEnumStringD di1;
-        di1[Test::enum1] = "abc";
+        di1[ICE_ENUM(MyEnum, enum1)] = "abc";
         Test::MyEnumStringD di2;
-        di2[Test::enum2] = "Hello!!";
-        di2[Test::enum3] = "qwerty";
+        di2[ICE_ENUM(MyEnum, enum2)] = "Hello!!";
+        di2[ICE_ENUM(MyEnum, enum3)] = "qwerty";
 
         Test::MyEnumStringD _do;
         Test::MyEnumStringD ro = p->opMyEnumStringD(di1, di2, _do);
 
         test(_do == di1);
         test(ro.size() == 3);
-        test(ro[Test::enum1] == "abc");
-        test(ro[Test::enum2] == "Hello!!");
-        test(ro[Test::enum3] == "qwerty");
+        test(ro[ICE_ENUM(MyEnum, enum1)] == "abc");
+        test(ro[ICE_ENUM(MyEnum, enum2)] == "Hello!!");
+        test(ro[ICE_ENUM(MyEnum, enum3)] == "qwerty");
     }
 
     {
         Test::MyStruct s11 = { 1, 1 };
         Test::MyStruct s12 = { 1, 2 };
         Test::MyStructMyEnumD di1;
-        di1[s11] = Test::enum1;
-        di1[s12] = Test::enum2;
+        di1[s11] = ICE_ENUM(MyEnum, enum1);
+        di1[s12] = ICE_ENUM(MyEnum, enum2);
 
         Test::MyStruct s22 = { 2, 2 };
         Test::MyStruct s23 = { 2, 3 };
         Test::MyStructMyEnumD di2;
-        di2[s11] = Test::enum1;
-        di2[s22] = Test::enum3;
-        di2[s23] = Test::enum2;
+        di2[s11] = ICE_ENUM(MyEnum, enum1);
+        di2[s22] = ICE_ENUM(MyEnum, enum3);
+        di2[s23] = ICE_ENUM(MyEnum, enum2);
 
         Test::MyStructMyEnumD _do;
         Test::MyStructMyEnumD ro = p->opMyStructMyEnumD(di1, di2, _do);
 
         test(_do == di1);
         test(ro.size() == 4);
-        test(ro[s11] == Test::enum1);
-        test(ro[s12] == Test::enum2);
-        test(ro[s22] == Test::enum3);
-        test(ro[s23] == Test::enum2);
+        test(ro[s11] == ICE_ENUM(MyEnum, enum1));
+        test(ro[s12] == ICE_ENUM(MyEnum, enum2));
+        test(ro[s22] == ICE_ENUM(MyEnum, enum3));
+        test(ro[s23] == ICE_ENUM(MyEnum, enum2));
     }
 
     {
@@ -999,14 +1009,14 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         dsi2.resize(1);
 
         Test::StringMyEnumD di1;
-        di1["abc"] = Test::enum1;
-        di1[""] = Test::enum2;
+        di1["abc"] = ICE_ENUM(MyEnum, enum1);
+        di1[""] = ICE_ENUM(MyEnum, enum2);
         Test::StringMyEnumD di2;
-        di2["abc"] = Test::enum1;
-        di2["qwerty"] = Test::enum3;
-        di2["Hello!!"] = Test::enum2;
+        di2["abc"] = ICE_ENUM(MyEnum, enum1);
+        di2["qwerty"] = ICE_ENUM(MyEnum, enum3);
+        di2["Hello!!"] = ICE_ENUM(MyEnum, enum2);
         Test::StringMyEnumD di3;
-        di3["Goodbye"] = Test::enum1;
+        di3["Goodbye"] = ICE_ENUM(MyEnum, enum1);
 
         dsi1[0] = di1;
         dsi1[1] = di2;
@@ -1019,23 +1029,23 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
 
             test(ro.size() == 2);
             test(ro[0].size() == 3);
-            test(ro[0]["abc"] == Test::enum1);
-            test(ro[0]["qwerty"] == Test::enum3);
-            test(ro[0]["Hello!!"] == Test::enum2);
+            test(ro[0]["abc"] == ICE_ENUM(MyEnum, enum1));
+            test(ro[0]["qwerty"] == ICE_ENUM(MyEnum, enum3));
+            test(ro[0]["Hello!!"] == ICE_ENUM(MyEnum, enum2));
             test(ro[1].size() == 2);
-            test(ro[1]["abc"] == Test::enum1);
-            test(ro[1][""] == Test::enum2);
+            test(ro[1]["abc"] == ICE_ENUM(MyEnum, enum1));
+            test(ro[1][""] == ICE_ENUM(MyEnum, enum2));
 
             test(_do.size() == 3);
             test(_do[0].size() == 1);
-            test(_do[0]["Goodbye"] == Test::enum1);
+            test(_do[0]["Goodbye"] == ICE_ENUM(MyEnum, enum1));
             test(_do[1].size() == 2);
-            test(_do[1]["abc"] == Test::enum1);
-            test(_do[1][""] == Test::enum2);
+            test(_do[1]["abc"] == ICE_ENUM(MyEnum, enum1));
+            test(_do[1][""] == ICE_ENUM(MyEnum, enum2));
             test(_do[2].size() == 3);
-            test(_do[2]["abc"] == Test::enum1);
-            test(_do[2]["qwerty"] == Test::enum3);
-            test(_do[2]["Hello!!"] == Test::enum2);
+            test(_do[2]["abc"] == ICE_ENUM(MyEnum, enum1));
+            test(_do[2]["qwerty"] == ICE_ENUM(MyEnum, enum3));
+            test(_do[2]["Hello!!"] == ICE_ENUM(MyEnum, enum2));
         }
         catch(const Ice::OperationNotExistException&)
         {
@@ -1049,12 +1059,12 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         dsi2.resize(1);
 
         Test::MyEnumStringD di1;
-        di1[Test::enum1] = "abc";
+        di1[ICE_ENUM(MyEnum, enum1)] = "abc";
         Test::MyEnumStringD di2;
-        di2[Test::enum2] = "Hello!!";
-        di2[Test::enum3] = "qwerty";
+        di2[ICE_ENUM(MyEnum, enum2)] = "Hello!!";
+        di2[ICE_ENUM(MyEnum, enum3)] = "qwerty";
         Test::MyEnumStringD di3;
-        di3[Test::enum1] = "Goodbye";
+        di3[ICE_ENUM(MyEnum, enum1)] = "Goodbye";
 
         dsi1[0] = di1;
         dsi1[1] = di2;
@@ -1067,19 +1077,19 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
 
             test(ro.size() == 2);
             test(ro[0].size() == 2);
-            test(ro[0][Test::enum2] == "Hello!!");
-            test(ro[0][Test::enum3] == "qwerty");
+            test(ro[0][ICE_ENUM(MyEnum, enum2)] == "Hello!!");
+            test(ro[0][ICE_ENUM(MyEnum, enum3)] == "qwerty");
             test(ro[1].size() == 1);
-            test(ro[1][Test::enum1] == "abc");
+            test(ro[1][ICE_ENUM(MyEnum, enum1)] == "abc");
 
             test(_do.size() == 3);
             test(_do[0].size() == 1);
-            test(_do[0][Test::enum1] == "Goodbye");
+            test(_do[0][ICE_ENUM(MyEnum, enum1)] == "Goodbye");
             test(_do[1].size() == 1);
-            test(_do[1][Test::enum1] == "abc");
+            test(_do[1][ICE_ENUM(MyEnum, enum1)] == "abc");
             test(_do[2].size() == 2);
-            test(_do[2][Test::enum2] == "Hello!!");
-            test(_do[2][Test::enum3] == "qwerty");
+            test(_do[2][ICE_ENUM(MyEnum, enum2)] == "Hello!!");
+            test(_do[2][ICE_ENUM(MyEnum, enum3)] == "qwerty");
         }
         catch(const Ice::OperationNotExistException&)
         {
@@ -1095,18 +1105,18 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         Test::MyStruct s11 = { 1, 1 };
         Test::MyStruct s12 = { 1, 2 };
         Test::MyStructMyEnumD di1;
-        di1[s11] = Test::enum1;
-        di1[s12] = Test::enum2;
+        di1[s11] = ICE_ENUM(MyEnum, enum1);
+        di1[s12] = ICE_ENUM(MyEnum, enum2);
 
         Test::MyStruct s22 = { 2, 2 };
         Test::MyStruct s23 = { 2, 3 };
         Test::MyStructMyEnumD di2;
-        di2[s11] = Test::enum1;
-        di2[s22] = Test::enum3;
-        di2[s23] = Test::enum2;
+        di2[s11] = ICE_ENUM(MyEnum, enum1);
+        di2[s22] = ICE_ENUM(MyEnum, enum3);
+        di2[s23] = ICE_ENUM(MyEnum, enum2);
 
         Test::MyStructMyEnumD di3;
-        di3[s23] = Test::enum3;
+        di3[s23] = ICE_ENUM(MyEnum, enum3);
 
         dsi1[0] = di1;
         dsi1[1] = di2;
@@ -1119,23 +1129,23 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
 
             test(ro.size() == 2);
             test(ro[0].size() == 3);
-            test(ro[0][s11] == Test::enum1);
-            test(ro[0][s22] == Test::enum3);
-            test(ro[0][s23] == Test::enum2);
+            test(ro[0][s11] == ICE_ENUM(MyEnum, enum1));
+            test(ro[0][s22] == ICE_ENUM(MyEnum, enum3));
+            test(ro[0][s23] == ICE_ENUM(MyEnum, enum2));
             test(ro[1].size() == 2);
-            test(ro[1][s11] == Test::enum1);
-            test(ro[1][s12] == Test::enum2);
+            test(ro[1][s11] == ICE_ENUM(MyEnum, enum1));
+            test(ro[1][s12] == ICE_ENUM(MyEnum, enum2));
 
             test(_do.size() == 3);
             test(_do[0].size() == 1);
-            test(_do[0][s23] == Test::enum3);
+            test(_do[0][s23] == ICE_ENUM(MyEnum, enum3));
             test(_do[1].size() == 2);
-            test(_do[1][s11] == Test::enum1);
-            test(_do[1][s12] == Test::enum2);
+            test(_do[1][s11] == ICE_ENUM(MyEnum, enum1));
+            test(_do[1][s12] == ICE_ENUM(MyEnum, enum2));
             test(_do[2].size() == 3);
-            test(_do[2][s11] == Test::enum1);
-            test(_do[2][s22] == Test::enum3);
-            test(_do[2][s23] == Test::enum2);
+            test(_do[2][s11] == ICE_ENUM(MyEnum, enum1));
+            test(_do[2][s22] == ICE_ENUM(MyEnum, enum3));
+            test(_do[2][s23] == ICE_ENUM(MyEnum, enum2));
         }
         catch(const Ice::OperationNotExistException&)
         {
@@ -1486,17 +1496,17 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         Test::MyEnumS si2;
         Test::MyEnumS si3;
 
-        si1.push_back(Test::enum1);
-        si1.push_back(Test::enum1);
-        si1.push_back(Test::enum2);
-        si2.push_back(Test::enum1);
-        si2.push_back(Test::enum2);
-        si3.push_back(Test::enum3);
-        si3.push_back(Test::enum3);
+        si1.push_back(ICE_ENUM(MyEnum, enum1));
+        si1.push_back(ICE_ENUM(MyEnum, enum1));
+        si1.push_back(ICE_ENUM(MyEnum, enum2));
+        si2.push_back(ICE_ENUM(MyEnum, enum1));
+        si2.push_back(ICE_ENUM(MyEnum, enum2));
+        si3.push_back(ICE_ENUM(MyEnum, enum3));
+        si3.push_back(ICE_ENUM(MyEnum, enum3));
 
-        sdi1[Test::enum3] = si1;
-        sdi1[Test::enum2] = si2;
-        sdi2[Test::enum1] = si3;
+        sdi1[ICE_ENUM(MyEnum, enum3)] = si1;
+        sdi1[ICE_ENUM(MyEnum, enum2)] = si2;
+        sdi2[ICE_ENUM(MyEnum, enum1)] = si3;
 
         try
         {
@@ -1505,16 +1515,16 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
 
             test(_do == sdi2);
             test(ro.size() == 3);
-            test(ro[Test::enum3].size() == 3);
-            test(ro[Test::enum3][0] == Test::enum1);
-            test(ro[Test::enum3][1] == Test::enum1);
-            test(ro[Test::enum3][2] == Test::enum2);
-            test(ro[Test::enum2].size() == 2);
-            test(ro[Test::enum2][0] == Test::enum1);
-            test(ro[Test::enum2][1] == Test::enum2);
-            test(ro[Test::enum1].size() == 2);
-            test(ro[Test::enum1][0] == Test::enum3);
-            test(ro[Test::enum1][1] == Test::enum3);
+            test(ro[ICE_ENUM(MyEnum, enum3)].size() == 3);
+            test(ro[ICE_ENUM(MyEnum, enum3)][0] == ICE_ENUM(MyEnum, enum1));
+            test(ro[ICE_ENUM(MyEnum, enum3)][1] == ICE_ENUM(MyEnum, enum1));
+            test(ro[ICE_ENUM(MyEnum, enum3)][2] == ICE_ENUM(MyEnum, enum2));
+            test(ro[ICE_ENUM(MyEnum, enum2)].size() == 2);
+            test(ro[ICE_ENUM(MyEnum, enum2)][0] == ICE_ENUM(MyEnum, enum1));
+            test(ro[ICE_ENUM(MyEnum, enum2)][1] == ICE_ENUM(MyEnum, enum2));
+            test(ro[ICE_ENUM(MyEnum, enum1)].size() == 2);
+            test(ro[ICE_ENUM(MyEnum, enum1)][0] == ICE_ENUM(MyEnum, enum3));
+            test(ro[ICE_ENUM(MyEnum, enum1)][1] == ICE_ENUM(MyEnum, enum3));
         }
         catch(const Ice::OperationNotExistException&)
         {
@@ -1556,7 +1566,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
             test(r == ctx);
         }
         {
-            Test::MyClassPrx p2 = Test::MyClassPrx::checkedCast(p->ice_context(ctx));
+            Test::MyClassPrxPtr p2 = ICE_CHECKED_CAST(Test::MyClassPrx, p->ice_context(ctx));
             test(p2->ice_getContext() == ctx);
             Test::StringStringD r = p2->opContext();
             test(r == ctx);
@@ -1585,8 +1595,8 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                 ctx["two"] = "TWO";
                 ctx["three"] = "THREE";
 
-                Test::MyClassPrx p = Test::MyClassPrx::uncheckedCast(
-                                        ic->stringToProxy("test:default -p 12010 -t 10000"));
+                Test::MyClassPrxPtr p = ICE_UNCHECKED_CAST(Test::MyClassPrx,
+                                                           ic->stringToProxy("test:default -p 12010 -t 10000"));
 
                 ic->getImplicitContext()->setContext(ctx);
                 test(ic->getImplicitContext()->getContext() == ctx);
@@ -1608,7 +1618,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                 combined.insert(ctx.begin(), ctx.end());
                 test(combined["one"] == "UN");
 
-                p = Test::MyClassPrx::uncheckedCast(p->ice_context(prxContext));
+                p = ICE_UNCHECKED_CAST(Test::MyClassPrx, p->ice_context(prxContext));
 
                 ic->getImplicitContext()->setContext(Ice::Context());
                 test(p->opContext() == prxContext);
@@ -1650,7 +1660,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
     test(p->opDouble1(1.0) == 1.0);
     test(p->opString1("opString1") == "opString1");
 
-    Test::MyDerivedClassPrx d = Test::MyDerivedClassPrx::uncheckedCast(p);
+    Test::MyDerivedClassPrxPtr d = ICE_UNCHECKED_CAST(Test::MyDerivedClassPrx, p);
 
     Test::MyStruct1 s;
     s.tesT = "Test::MyStruct1::s";
@@ -1661,7 +1671,7 @@ twoways(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
     test(s.myClass == 0);
     test(s.myStruct1 == "Test::MyStruct1::myStruct1");
 
-    Test::MyClass1Ptr c = new Test::MyClass1();
+    Test::MyClass1Ptr c = ICE_MAKE_SHARED(Test::MyClass1);
     c->tesT = "Test::MyClass1::testT";
     c->myClass = 0;
     c->myClass1 = "Test::MyClass1::myClass1";
diff --git a/cpp/test/Ice/operations/TwowaysAMI.cpp b/cpp/test/Ice/operations/TwowaysAMI.cpp
index 97ae75e9f6f..f6606431f9a 100644
--- a/cpp/test/Ice/operations/TwowaysAMI.cpp
+++ b/cpp/test/Ice/operations/TwowaysAMI.cpp
@@ -28,7 +28,7 @@
 #endif
 
 using namespace std;
-
+using namespace Test;
 namespace
 {
 
@@ -162,12 +162,12 @@ public:
 
     void opMyEnum(Test::MyEnum r, Test::MyEnum e)
     {
-        test(e == Test::enum2);
-        test(r == Test::enum3);
+        test(e == ICE_ENUM(Test::MyEnum, enum2));
+        test(r == ICE_ENUM(Test::MyEnum, enum3));
         called();
     }
 
-    void opMyClass(const Test::MyClassPrx& r, const Test::MyClassPrx& c1, const Test::MyClassPrx& c2)
+    void opMyClass(const Test::MyClassPrxPtr& r, const Test::MyClassPrxPtr& c1, const Test::MyClassPrxPtr& c2)
     {
         test(c1->ice_getIdentity() == _communicator->stringToIdentity("test"));
         test(c2->ice_getIdentity() == _communicator->stringToIdentity("noSuchIdentity"));
@@ -195,9 +195,9 @@ public:
     void opStruct(const Test::Structure& rso, const Test::Structure& so)
     {
         test(rso.p == 0);
-        test(rso.e == Test::enum2);
+        test(rso.e == ICE_ENUM(Test::MyEnum, enum2));
         test(rso.s.s == "def");
-        test(so.e == Test::enum3);
+        test(so.e == ICE_ENUM(Test::MyEnum, enum3));
         test(so.s.s == "a new string");
 
         //
@@ -502,18 +502,18 @@ public:
     void opStringMyEnumD(const Test::StringMyEnumD& ro, const Test::StringMyEnumD& _do)
     {
         Test::StringMyEnumD di1;
-        di1["abc"] = Test::enum1;
-        di1[""] = Test::enum2;
+        di1["abc"] = ICE_ENUM(Test::MyEnum, enum1);
+        di1[""] = ICE_ENUM(Test::MyEnum, enum2);
         test(_do == di1);
         test(ro.size() == 4);
         test(ro.find("abc") != ro.end());
-        test(ro.find("abc")->second == Test::enum1);
+        test(ro.find("abc")->second == ICE_ENUM(Test::MyEnum, enum1));
         test(ro.find("qwerty") != ro.end());
-        test(ro.find("qwerty")->second == Test::enum3);
+        test(ro.find("qwerty")->second == ICE_ENUM(Test::MyEnum, enum3));
         test(ro.find("") != ro.end());
-        test(ro.find("")->second == Test::enum2);
+        test(ro.find("")->second == ICE_ENUM(Test::MyEnum, enum2));
         test(ro.find("Hello!!") != ro.end());
-        test(ro.find("Hello!!")->second == Test::enum2);
+        test(ro.find("Hello!!")->second == ICE_ENUM(Test::MyEnum, enum2));
         called();
     }
 
@@ -522,20 +522,20 @@ public:
         Test::MyStruct s11 = { 1, 1 };
         Test::MyStruct s12 = { 1, 2 };
         Test::MyStructMyEnumD di1;
-        di1[s11] = Test::enum1;
-        di1[s12] = Test::enum2;
+        di1[s11] = ICE_ENUM(Test::MyEnum, enum1);
+        di1[s12] = ICE_ENUM(Test::MyEnum, enum2);
         test(_do == di1);
         Test::MyStruct s22 = { 2, 2 };
         Test::MyStruct s23 = { 2, 3 };
         test(ro.size() == 4);
         test(ro.find(s11) != ro.end());
-        test(ro.find(s11)->second == Test::enum1);
+        test(ro.find(s11)->second == ICE_ENUM(Test::MyEnum, enum1));
         test(ro.find(s12) != ro.end());
-        test(ro.find(s12)->second == Test::enum2);
+        test(ro.find(s12)->second == ICE_ENUM(Test::MyEnum, enum2));
         test(ro.find(s22) != ro.end());
-        test(ro.find(s22)->second == Test::enum3);
+        test(ro.find(s22)->second == ICE_ENUM(Test::MyEnum, enum3));
         test(ro.find(s23) != ro.end());
-        test(ro.find(s23)->second == Test::enum2);
+        test(ro.find(s23)->second == ICE_ENUM(Test::MyEnum, enum2));
         called();
     }
 
@@ -680,32 +680,32 @@ public:
         test(ro.size() == 2);
         test(ro[0].size() == 3);
         test(ro[0].find("abc") != ro[0].end());
-        test(ro[0].find("abc")->second == Test::enum1);
+        test(ro[0].find("abc")->second == ICE_ENUM(Test::MyEnum, enum1));
         test(ro[0].find("qwerty") != ro[0].end());
-        test(ro[0].find("qwerty")->second == Test::enum3);
+        test(ro[0].find("qwerty")->second == ICE_ENUM(Test::MyEnum, enum3));
         test(ro[0].find("Hello!!") != ro[0].end());
-        test(ro[0].find("Hello!!")->second == Test::enum2);
+        test(ro[0].find("Hello!!")->second == ICE_ENUM(Test::MyEnum, enum2));
         test(ro[1].size() == 2);
         test(ro[1].find("abc") != ro[1].end());
-        test(ro[1].find("abc")->second == Test::enum1);
+        test(ro[1].find("abc")->second == ICE_ENUM(Test::MyEnum, enum1));
         test(ro[1].find("") != ro[1].end());
-        test(ro[1].find("")->second == Test::enum2);
+        test(ro[1].find("")->second == ICE_ENUM(Test::MyEnum, enum2));
         test(_do.size() == 3);
         test(_do[0].size() == 1);
         test(_do[0].find("Goodbye") != _do[0].end());
-        test(_do[0].find("Goodbye")->second == Test::enum1);
+        test(_do[0].find("Goodbye")->second == ICE_ENUM(Test::MyEnum, enum1));
         test(_do[1].size() == 2);
         test(_do[1].find("abc") != _do[1].end());
-        test(_do[1].find("abc")->second == Test::enum1);
+        test(_do[1].find("abc")->second == ICE_ENUM(Test::MyEnum, enum1));
         test(_do[1].find("") != _do[1].end());
-        test(_do[1].find("")->second == Test::enum2);
+        test(_do[1].find("")->second == ICE_ENUM(Test::MyEnum, enum2));
         test(_do[2].size() == 3);
         test(_do[2].find("abc") != _do[2].end());
-        test(_do[2].find("abc")->second == Test::enum1);
+        test(_do[2].find("abc")->second == ICE_ENUM(Test::MyEnum, enum1));
         test(_do[2].find("qwerty") != _do[2].end());
-        test(_do[2].find("qwerty")->second == Test::enum3);
+        test(_do[2].find("qwerty")->second == ICE_ENUM(Test::MyEnum, enum3));
         test(_do[2].find("Hello!!") != _do[2].end());
-        test(_do[2].find("Hello!!")->second == Test::enum2);
+        test(_do[2].find("Hello!!")->second == ICE_ENUM(Test::MyEnum, enum2));
         called();
     }
 
@@ -713,25 +713,25 @@ public:
     {
         test(ro.size() == 2);
         test(ro[0].size() == 2);
-        test(ro[0].find(Test::enum2) != ro[0].end());
-        test(ro[0].find(Test::enum2)->second == "Hello!!");
-        test(ro[0].find(Test::enum3) != ro[0].end());
-        test(ro[0].find(Test::enum3)->second == "qwerty");
+        test(ro[0].find(ICE_ENUM(Test::MyEnum, enum2)) != ro[0].end());
+        test(ro[0].find(ICE_ENUM(Test::MyEnum, enum2))->second == "Hello!!");
+        test(ro[0].find(ICE_ENUM(Test::MyEnum, enum3)) != ro[0].end());
+        test(ro[0].find(ICE_ENUM(Test::MyEnum, enum3))->second == "qwerty");
         test(ro[1].size() == 1);
-        test(ro[1].find(Test::enum1) != ro[1].end());
-        test(ro[1].find(Test::enum1)->second == "abc");
+        test(ro[1].find(ICE_ENUM(Test::MyEnum, enum1)) != ro[1].end());
+        test(ro[1].find(ICE_ENUM(Test::MyEnum, enum1))->second == "abc");
         test(_do.size() == 3);
         test(_do[0].size() == 1);
-        test(_do[0].find(Test::enum1) != _do[0].end());
-        test(_do[0].find(Test::enum1)->second == "Goodbye");
+        test(_do[0].find(ICE_ENUM(Test::MyEnum, enum1)) != _do[0].end());
+        test(_do[0].find(ICE_ENUM(Test::MyEnum, enum1))->second == "Goodbye");
         test(_do[1].size() == 1);
-        test(_do[1].find(Test::enum1) != _do[1].end());
-        test(_do[1].find(Test::enum1)->second == "abc");
+        test(_do[1].find(ICE_ENUM(Test::MyEnum, enum1)) != _do[1].end());
+        test(_do[1].find(ICE_ENUM(Test::MyEnum, enum1))->second == "abc");
         test(_do[2].size() == 2);
-        test(_do[2].find(Test::enum2) != _do[2].end());
-        test(_do[2].find(Test::enum2)->second == "Hello!!");
-        test(_do[2].find(Test::enum3) != _do[2].end());
-        test(_do[2].find(Test::enum3)->second == "qwerty");
+        test(_do[2].find(ICE_ENUM(Test::MyEnum, enum2)) != _do[2].end());
+        test(_do[2].find(ICE_ENUM(Test::MyEnum, enum2))->second == "Hello!!");
+        test(_do[2].find(ICE_ENUM(Test::MyEnum, enum3)) != _do[2].end());
+        test(_do[2].find(ICE_ENUM(Test::MyEnum, enum3))->second == "qwerty");
         called();
     }
 
@@ -745,32 +745,32 @@ public:
         test(ro.size() == 2);
         test(ro[0].size() == 3);
         test(ro[0].find(s11) != ro[0].end());
-        test(ro[0].find(s11)->second == Test::enum1);
+        test(ro[0].find(s11)->second == ICE_ENUM(Test::MyEnum, enum1));
         test(ro[0].find(s22) != ro[0].end());
-        test(ro[0].find(s22)->second == Test::enum3);
+        test(ro[0].find(s22)->second == ICE_ENUM(Test::MyEnum, enum3));
         test(ro[0].find(s23) != ro[0].end());
-        test(ro[0].find(s23)->second == Test::enum2);
+        test(ro[0].find(s23)->second == ICE_ENUM(Test::MyEnum, enum2));
         test(ro[1].size() == 2);
         test(ro[1].find(s11) != ro[1].end());
-        test(ro[1].find(s11)->second == Test::enum1);
+        test(ro[1].find(s11)->second == ICE_ENUM(Test::MyEnum, enum1));
         test(ro[1].find(s12) != ro[1].end());
-        test(ro[1].find(s12)->second == Test::enum2);
+        test(ro[1].find(s12)->second == ICE_ENUM(Test::MyEnum, enum2));
         test(_do.size() == 3);
         test(_do[0].size() == 1);
         test(_do[0].find(s23) != _do[0].end());
-        test(_do[0].find(s23)->second == Test::enum3);
+        test(_do[0].find(s23)->second == ICE_ENUM(Test::MyEnum, enum3));
         test(_do[1].size() == 2);
         test(_do[1].find(s11) != _do[1].end());
-        test(_do[1].find(s11)->second == Test::enum1);
+        test(_do[1].find(s11)->second == ICE_ENUM(Test::MyEnum, enum1));
         test(_do[1].find(s12) != _do[1].end());
-        test(_do[1].find(s12)->second == Test::enum2);
+        test(_do[1].find(s12)->second == ICE_ENUM(Test::MyEnum, enum2));
         test(_do[2].size() == 3);
         test(_do[2].find(s11) != _do[2].end());
-        test(_do[2].find(s11)->second == Test::enum1);
+        test(_do[2].find(s11)->second == ICE_ENUM(Test::MyEnum, enum1));
         test(_do[2].find(s22) != _do[2].end());
-        test(_do[2].find(s22)->second == Test::enum3);
+        test(_do[2].find(s22)->second == ICE_ENUM(Test::MyEnum, enum3));
         test(_do[2].find(s23) != _do[2].end());
-        test(_do[2].find(s23)->second == Test::enum2);
+        test(_do[2].find(s23)->second == ICE_ENUM(Test::MyEnum, enum2));
         called();
     }
 
@@ -963,24 +963,24 @@ public:
     void opMyEnumMyEnumSD(const Test::MyEnumMyEnumSD& ro, const Test::MyEnumMyEnumSD& _do)
     {
         test(_do.size() == 1);
-        test(_do.find(Test::enum1) != _do.end());
-        test(_do.find(Test::enum1)->second.size() == 2);
-        test(_do.find(Test::enum1)->second[0] == Test::enum3);
-        test(_do.find(Test::enum1)->second[1] == Test::enum3);
+        test(_do.find(ICE_ENUM(Test::MyEnum, enum1)) != _do.end());
+        test(_do.find(ICE_ENUM(Test::MyEnum, enum1))->second.size() == 2);
+        test(_do.find(ICE_ENUM(Test::MyEnum, enum1))->second[0] == ICE_ENUM(Test::MyEnum, enum3));
+        test(_do.find(ICE_ENUM(Test::MyEnum, enum1))->second[1] == ICE_ENUM(Test::MyEnum, enum3));
         test(ro.size() == 3);
-        test(ro.find(Test::enum3) != ro.end());
-        test(ro.find(Test::enum3)->second.size() == 3);
-        test(ro.find(Test::enum3)->second[0] == Test::enum1);
-        test(ro.find(Test::enum3)->second[1] == Test::enum1);
-        test(ro.find(Test::enum3)->second[2] == Test::enum2);
-        test(ro.find(Test::enum2) != ro.end());
-        test(ro.find(Test::enum2)->second.size() == 2);
-        test(ro.find(Test::enum2)->second[0] == Test::enum1);
-        test(ro.find(Test::enum2)->second[1] == Test::enum2);
-        test(ro.find(Test::enum1) != ro.end());
-        test(ro.find(Test::enum1)->second.size() == 2);
-        test(ro.find(Test::enum1)->second[0] == Test::enum3);
-        test(ro.find(Test::enum1)->second[1] == Test::enum3);
+        test(ro.find(ICE_ENUM(Test::MyEnum, enum3)) != ro.end());
+        test(ro.find(ICE_ENUM(Test::MyEnum, enum3))->second.size() == 3);
+        test(ro.find(ICE_ENUM(Test::MyEnum, enum3))->second[0] == ICE_ENUM(Test::MyEnum, enum1));
+        test(ro.find(ICE_ENUM(Test::MyEnum, enum3))->second[1] == ICE_ENUM(Test::MyEnum, enum1));
+        test(ro.find(ICE_ENUM(Test::MyEnum, enum3))->second[2] == ICE_ENUM(Test::MyEnum, enum2));
+        test(ro.find(ICE_ENUM(Test::MyEnum, enum2)) != ro.end());
+        test(ro.find(ICE_ENUM(Test::MyEnum, enum2))->second.size() == 2);
+        test(ro.find(ICE_ENUM(Test::MyEnum, enum2))->second[0] == ICE_ENUM(Test::MyEnum, enum1));
+        test(ro.find(ICE_ENUM(Test::MyEnum, enum2))->second[1] == ICE_ENUM(Test::MyEnum, enum2));
+        test(ro.find(ICE_ENUM(Test::MyEnum, enum1)) != ro.end());
+        test(ro.find(ICE_ENUM(Test::MyEnum, enum1))->second.size() == 2);
+        test(ro.find(ICE_ENUM(Test::MyEnum, enum1))->second[0] == ICE_ENUM(Test::MyEnum, enum3));
+        test(ro.find(ICE_ENUM(Test::MyEnum, enum1))->second[1] == ICE_ENUM(Test::MyEnum, enum3));
         called();
     }
 
@@ -1037,130 +1037,268 @@ typedef IceUtil::Handle<Callback> CallbackPtr;
 
 }
 
+#ifdef ICE_CPP11_MAPPING
+function<void (exception_ptr)>
+makeExceptionClosure(CallbackPtr& cb)
+{
+    return [&](exception_ptr e)
+        {
+            try
+            {
+                rethrow_exception(e);
+            }
+            catch(const Ice::Exception& ex)
+            {
+                cb->exCB(ex);
+            }
+        };
+}
+#endif
+
 void
-twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
+twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrxPtr& p)
 {
     {
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->ice_ping_async(
+            [&]()
+            {
+                cb->ping();
+            },
+            makeExceptionClosure(cb));
+#else
         Ice::Callback_Object_ice_pingPtr callback = Ice::newCallback_Object_ice_ping(cb,
                                                                                      &Callback::ping,
                                                                                      &Callback::exCB);
         p->begin_ice_ping(callback);
+#endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->ice_isA_async(
+            Test::MyClass::ice_staticId(),
+            [&](bool v)
+            {
+                cb->isA(v);
+            },
+            makeExceptionClosure(cb));
+#else
         Ice::Callback_Object_ice_isAPtr callback = Ice::newCallback_Object_ice_isA(cb,
                                                                                    &Callback::isA,
                                                                                    &Callback::exCB);
-        p->begin_ice_isA(Test::MyClass::ice_staticId(), callback);
+        p->begin_ice_isA(Test::MyClass::ice_staticId(), callback);        
+#endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->ice_id_async(
+            [&](string id)
+            {
+                cb->id(move(id));
+            },
+            makeExceptionClosure(cb));
+#else
         Ice::Callback_Object_ice_idPtr callback = Ice::newCallback_Object_ice_id(cb,
                                                                                  &Callback::id,
                                                                                  &Callback::exCB);
         p->begin_ice_id(callback);
+#endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->ice_ids_async(
+            [&](vector<string> ids)
+            {
+                cb->ids(move(ids));
+            },
+            makeExceptionClosure(cb));
+            
+#else
         Ice::Callback_Object_ice_idsPtr callback = Ice::newCallback_Object_ice_ids(cb,
                                                                                    &Callback::ids,
                                                                                    &Callback::exCB);
         p->begin_ice_ids(callback);
+#endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opVoid_async(
+            [&]()
+            {
+                cb->opVoid();
+            },
+            makeExceptionClosure(cb));
+            
+#else
         Test::Callback_MyClass_opVoidPtr callback = Test::newCallback_MyClass_opVoid(cb,
                                                                                      &Callback::opVoid,
                                                                                      &Callback::exCB);
         p->begin_opVoid(callback);
+#endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opByte_async(Ice::Byte(0xff), Ice::Byte(0x0f),
+            [&](Ice::Byte b1, Ice::Byte b2)
+            {
+                cb->opByte(b1, b2);
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opBytePtr callback = Test::newCallback_MyClass_opByte(cb,
                                                                                      &Callback::opByte,
                                                                                      &Callback::exCB);
         p->begin_opByte(Ice::Byte(0xff), Ice::Byte(0x0f), callback);
+#endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opBool_async(true, false,
+            [&](bool b1, bool b2)
+            {
+                cb->opBool(b1, b2);
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opBoolPtr callback = Test::newCallback_MyClass_opBool(cb,
                                                                                      &Callback::opBool,
                                                                                      &Callback::exCB);
         p->begin_opBool(true, false, callback);
+#endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opShortIntLong_async(10, 11, 12,
+            [&](long long int l1, short s1, int i1, long long int l2)
+            {
+                cb->opShortIntLong(l1, s1, i1, l2);
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opShortIntLongPtr callback =
             Test::newCallback_MyClass_opShortIntLong(cb, &Callback::opShortIntLong, &Callback::exCB);
         p->begin_opShortIntLong(10, 11, 12, callback);
+#endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opFloatDouble_async(3.14f, 1.1E10,
+            [&](double d1, float f1, double d2)
+            {
+                cb->opFloatDouble(d1, f1, d2);
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opFloatDoublePtr callback =
             Test::newCallback_MyClass_opFloatDouble(cb, &Callback::opFloatDouble, &Callback::exCB);
         p->begin_opFloatDouble(Ice::Float(3.14), Ice::Double(1.1E10), callback);
+#endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opString_async("hello", "world",
+            [&](string s1, string s2)
+            {
+                cb->opString(move(s1), move(s2));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opStringPtr callback = Test::newCallback_MyClass_opString(cb,
                                                                                          &Callback::opString,
                                                                                          &Callback::exCB);
         p->begin_opString("hello", "world", callback);
+#endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opMyEnum_async(MyEnum::enum2,
+            [&](MyEnum e1, MyEnum e2)
+            {
+                cb->opMyEnum(e1, e2);
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opMyEnumPtr callback = Test::newCallback_MyClass_opMyEnum(cb,
                                                                                          &Callback::opMyEnum,
                                                                                          &Callback::exCB);
         p->begin_opMyEnum(Test::enum2, callback);
+#endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback(communicator);
+#ifdef ICE_CPP11_MAPPING
+        p->opMyClass_async(p,
+            [&](shared_ptr<MyClassPrx> c1, shared_ptr<MyClassPrx> c2, shared_ptr<MyClassPrx> c3)
+            {
+                cb->opMyClass(move(c1), move(c2), move(c3));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opMyClassPtr callback = Test::newCallback_MyClass_opMyClass(cb,
                                                                                            &Callback::opMyClass,
                                                                                            &Callback::exCB);
         p->begin_opMyClass(p, callback);
+#endif
         cb->check();
     }
 
     {
         Test::Structure si1;
         si1.p = p;
-        si1.e = Test::enum3;
+        si1.e = ICE_ENUM(Test::MyEnum, enum3);
         si1.s.s = "abc";
         Test::Structure si2;
         si2.p = 0;
-        si2.e = Test::enum2;
+        si2.e = ICE_ENUM(Test::MyEnum, enum2);
         si2.s.s = "def";
 
         CallbackPtr cb = new Callback(communicator);
+#ifdef ICE_CPP11_MAPPING
+        p->opStruct_async(si1, si2,
+            [&](Test::Structure si3, Test::Structure si4)
+            {
+                cb->opStruct(move(si3), move(si4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opStructPtr callback = Test::newCallback_MyClass_opStruct(cb,
                                                                                          &Callback::opStruct,
                                                                                          &Callback::exCB);
         p->begin_opStruct(si1, si2, callback);
+#endif
         cb->check();
     }
 
@@ -1179,10 +1317,19 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         bsi2.push_back(Ice::Byte(0xf4));
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opByteS_async(bsi1, bsi2,
+            [&](Test::ByteS bsi3, Test::ByteS bsi4)
+            {
+                cb->opByteS(move(bsi3), move(bsi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opByteSPtr callback = Test::newCallback_MyClass_opByteS(cb,
                                                                                        &Callback::opByteS,
                                                                                        &Callback::exCB);
         p->begin_opByteS(bsi1, bsi2, callback);
+#endif
         cb->check();
     }
 
@@ -1197,10 +1344,19 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         bsi2.push_back(false);
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opBoolS_async(bsi1, bsi2,
+            [&](Test::BoolS bsi3, Test::BoolS bsi4)
+            {
+                cb->opBoolS(move(bsi3), move(bsi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opBoolSPtr callback = Test::newCallback_MyClass_opBoolS(cb,
                                                                                        &Callback::opBoolS,
                                                                                        &Callback::exCB);
         p->begin_opBoolS(bsi1, bsi2, callback);
+#endif
         cb->check();
     }
 
@@ -1223,9 +1379,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         lsi.push_back(20);
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opShortIntLongS_async(ssi, isi, lsi,
+            [&](Test::LongS lsi1, Test::ShortS ssi1, Test::IntS isi1, Test::LongS lsi2)
+            {
+                cb->opShortIntLongS(move(lsi1), move(ssi1), move(isi1), move(lsi2));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opShortIntLongSPtr callback =
             Test::newCallback_MyClass_opShortIntLongS(cb, &Callback::opShortIntLongS, &Callback::exCB);
         p->begin_opShortIntLongS(ssi, isi, lsi, callback);
+#endif
         cb->check();
     }
 
@@ -1241,9 +1406,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         dsi.push_back(Ice::Double(1.3E10));
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opFloatDoubleS_async(fsi, dsi,
+            [&](Test::DoubleS dsi1, Test::FloatS fsi1, Test::DoubleS dsi2)
+            {
+                cb->opFloatDoubleS(move(dsi1), move(fsi1), move(dsi2));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opFloatDoubleSPtr callback =
             Test::newCallback_MyClass_opFloatDoubleS(cb, &Callback::opFloatDoubleS, &Callback::exCB);
         p->begin_opFloatDoubleS(fsi, dsi, callback);
+#endif
         cb->check();
     }
 
@@ -1258,10 +1432,19 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         ssi2.push_back("xyz");
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opStringS_async(ssi1, ssi2,
+            [&](Test::StringS ssi3, Test::StringS ssi4)
+            {
+                cb->opStringS(move(ssi3), move(ssi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opStringSPtr callback = Test::newCallback_MyClass_opStringS(cb,
                                                                                            &Callback::opStringS,
                                                                                            &Callback::exCB);
         p->begin_opStringS(ssi1, ssi2, callback);
+#endif
         cb->check();
     }
 
@@ -1281,10 +1464,19 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         bsi2[1].push_back(Ice::Byte(0xf1));
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opByteSS_async(bsi1, bsi2,
+            [&](Test::ByteSS bsi3, Test::ByteSS bsi4)
+            {
+                cb->opByteSS(move(bsi3), move(bsi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opByteSSPtr callback = Test::newCallback_MyClass_opByteSS(cb,
                                                                                          &Callback::opByteSS,
                                                                                          &Callback::exCB);
         p->begin_opByteSS(bsi1, bsi2, callback);
+#endif
         cb->check();
     }
 
@@ -1304,10 +1496,19 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         bsi2[0].push_back(true);
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opBoolSS_async(bsi1, bsi2,
+            [&](Test::BoolSS bsi3, Test::BoolSS bsi4)
+            {
+                cb->opBoolSS(move(bsi3), move(bsi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opBoolSSPtr callback = Test::newCallback_MyClass_opBoolSS(cb,
                                                                                          &Callback::opBoolSS,
                                                                                          &Callback::exCB);
         p->begin_opBoolSS(bsi1, bsi2, callback);
+#endif
         cb->check();
     }
 
@@ -1329,10 +1530,19 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         lsi[0].push_back(1729);
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opShortIntLongSS_async(ssi, isi, lsi,
+            [&](Test::LongSS lsi1, Test::ShortSS ssi1, Test::IntSS isi1, Test::LongSS lsi2)
+            {
+                cb->opShortIntLongSS(move(lsi1), move(ssi1), move(isi1), move(lsi2));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opShortIntLongSSPtr callback = Test::newCallback_MyClass_opShortIntLongSS(cb,
                                                                                          &Callback::opShortIntLongSS,
                                                                                          &Callback::exCB);
         p->begin_opShortIntLongSS(ssi, isi, lsi, callback);
+#endif
         cb->check();
     }
 
@@ -1350,9 +1560,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         dsi[0].push_back(Ice::Double(1.3E10));
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opFloatDoubleSS_async(fsi, dsi,
+            [&](Test::DoubleSS dsi1, Test::FloatSS fsi1, Test::DoubleSS dsi2)
+            {
+                cb->opFloatDoubleSS(move(dsi1), move(fsi1), move(dsi2));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opFloatDoubleSSPtr callback =
             Test::newCallback_MyClass_opFloatDoubleSS(cb, &Callback::opFloatDoubleSS, &Callback::exCB);
         p->begin_opFloatDoubleSS(fsi, dsi, callback);
+#endif
         cb->check();
     }
 
@@ -1369,9 +1588,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         ssi2[2].push_back("xyz");
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opStringSS_async(ssi1, ssi2,
+            [&](Test::StringSS ssi3, Test::StringSS ssi4)
+            {
+                cb->opStringSS(move(ssi3), move(ssi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opStringSSPtr callback =
             Test::newCallback_MyClass_opStringSS(cb, &Callback::opStringSS, &Callback::exCB);
         p->begin_opStringSS(ssi1, ssi2, callback);
+#endif
         cb->check();
     }
 
@@ -1385,9 +1613,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         di2[101] = true;
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opByteBoolD_async(di1, di2,
+            [&](Test::ByteBoolD di3, Test::ByteBoolD di4)
+            {
+                cb->opByteBoolD(move(di3), move(di4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opByteBoolDPtr callback =
             Test::newCallback_MyClass_opByteBoolD(cb, &Callback::opByteBoolD, &Callback::exCB);
         p->begin_opByteBoolD(di1, di2, callback);
+#endif
         cb->check();
     }
 
@@ -1401,9 +1638,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         di2[1101] = 0;
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opShortIntD_async(di1, di2,
+            [&](Test::ShortIntD di3, Test::ShortIntD di4)
+            {
+                cb->opShortIntD(move(di3), move(di4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opShortIntDPtr callback =
             Test::newCallback_MyClass_opShortIntD(cb, &Callback::opShortIntD, &Callback::exCB);
         p->begin_opShortIntD(di1, di2, callback);
+#endif
         cb->check();
     }
 
@@ -1417,9 +1663,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         di2[999999130] = Ice::Float(0.5);
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opLongFloatD_async(di1, di2,
+            [&](Test::LongFloatD di3, Test::LongFloatD di4)
+            {
+                cb->opLongFloatD(move(di3), move(di4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opLongFloatDPtr callback =
             Test::newCallback_MyClass_opLongFloatD(cb, &Callback::opLongFloatD, &Callback::exCB);
         p->begin_opLongFloatD(di1, di2, callback);
+#endif
         cb->check();
     }
 
@@ -1433,25 +1688,43 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         di2["BAR"] = "abc 0.5";
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opStringStringD_async(di1, di2,
+            [&](Test::StringStringD di3, Test::StringStringD di4)
+            {
+                cb->opStringStringD(move(di3), move(di4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opStringStringDPtr callback =
             Test::newCallback_MyClass_opStringStringD(cb, &Callback::opStringStringD, &Callback::exCB);
         p->begin_opStringStringD(di1, di2, callback);
+#endif
         cb->check();
     }
 
     {
         Test::StringMyEnumD di1;
-        di1["abc"] = Test::enum1;
-        di1[""] = Test::enum2;
+        di1["abc"] = ICE_ENUM(Test::MyEnum, enum1);
+        di1[""] = ICE_ENUM(Test::MyEnum, enum2);
         Test::StringMyEnumD di2;
-        di2["abc"] = Test::enum1;
-        di2["qwerty"] = Test::enum3;
-        di2["Hello!!"] = Test::enum2;
+        di2["abc"] = ICE_ENUM(Test::MyEnum, enum1);
+        di2["qwerty"] = ICE_ENUM(Test::MyEnum, enum3);
+        di2["Hello!!"] = ICE_ENUM(Test::MyEnum, enum2);
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opStringMyEnumD_async(di1, di2,
+            [&](Test::StringMyEnumD di3, Test::StringMyEnumD di4)
+            {
+                cb->opStringMyEnumD(move(di3), move(di4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opStringMyEnumDPtr callback =
             Test::newCallback_MyClass_opStringMyEnumD(cb, &Callback::opStringMyEnumD, &Callback::exCB);
         p->begin_opStringMyEnumD(di1, di2, callback);
+#endif
         cb->check();
     }
 
@@ -1459,20 +1732,29 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         Test::MyStruct s11 = { 1, 1 };
         Test::MyStruct s12 = { 1, 2 };
         Test::MyStructMyEnumD di1;
-        di1[s11] = Test::enum1;
-        di1[s12] = Test::enum2;
+        di1[s11] = ICE_ENUM(Test::MyEnum, enum1);
+        di1[s12] = ICE_ENUM(Test::MyEnum, enum2);
 
         Test::MyStruct s22 = { 2, 2 };
         Test::MyStruct s23 = { 2, 3 };
         Test::MyStructMyEnumD di2;
-        di2[s11] = Test::enum1;
-        di2[s22] = Test::enum3;
-        di2[s23] = Test::enum2;
+        di2[s11] = ICE_ENUM(Test::MyEnum, enum1);
+        di2[s22] = ICE_ENUM(Test::MyEnum, enum3);
+        di2[s23] = ICE_ENUM(Test::MyEnum, enum2);
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opMyStructMyEnumD_async(di1, di2,
+            [&](Test::MyStructMyEnumD di3, Test::MyStructMyEnumD di4)
+            {
+                cb->opMyStructMyEnumD(move(di3), move(di4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opMyStructMyEnumDPtr callback =
             Test::newCallback_MyClass_opMyStructMyEnumD(cb, &Callback::opMyStructMyEnumD, &Callback::exCB);
         p->begin_opMyStructMyEnumD(di1, di2, callback);
+#endif
         cb->check();
     }
 
@@ -1498,9 +1780,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         dsi2[0] = di3;
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opByteBoolDS_async(dsi1, dsi2,
+            [&](Test::ByteBoolDS dsi3, Test::ByteBoolDS dsi4)
+            {
+                cb->opByteBoolDS(move(dsi3), move(dsi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opByteBoolDSPtr callback =
             Test::newCallback_MyClass_opByteBoolDS(cb, &Callback::opByteBoolDS, &Callback::exCB);
         p->begin_opByteBoolDS(dsi1, dsi2, callback);
+#endif
         cb->check();
     }
 
@@ -1525,9 +1816,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         dsi2[0] = di3;
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opShortIntDS_async(dsi1, dsi2,
+            [&](Test::ShortIntDS dsi3, Test::ShortIntDS dsi4)
+            {
+                cb->opShortIntDS(move(dsi3), move(dsi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opShortIntDSPtr callback =
             Test::newCallback_MyClass_opShortIntDS(cb, &Callback::opShortIntDS, &Callback::exCB);
         p->begin_opShortIntDS(dsi1, dsi2, callback);
+#endif
         cb->check();
     }
 
@@ -1552,9 +1852,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         dsi2[0] = di3;
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opLongFloatDS_async(dsi1, dsi2,
+            [&](Test::LongFloatDS dsi3, Test::LongFloatDS dsi4)
+            {
+                cb->opLongFloatDS(move(dsi3), move(dsi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opLongFloatDSPtr callback =
             Test::newCallback_MyClass_opLongFloatDS(cb, &Callback::opLongFloatDS, &Callback::exCB);
         p->begin_opLongFloatDS(dsi1, dsi2, callback);
+#endif
         cb->check();
     }
 
@@ -1579,9 +1888,19 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         dsi2[0] = di3;
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opStringStringDS_async(dsi1, dsi2,
+            [&](Test::StringStringDS dsi3, Test::StringStringDS dsi4)
+            {
+                cb->opStringStringDS(move(dsi3), move(dsi4));
+            },
+            makeExceptionClosure(cb));
+            
+#else
         Test::Callback_MyClass_opStringStringDSPtr callback =
             Test::newCallback_MyClass_opStringStringDS(cb, &Callback::opStringStringDS, &Callback::exCB);
         p->begin_opStringStringDS(dsi1, dsi2, callback);
+#endif
         cb->check();
     }
 
@@ -1592,23 +1911,32 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         dsi2.resize(1);
 
         Test::StringMyEnumD di1;
-        di1["abc"] = Test::enum1;
-        di1[""] = Test::enum2;
+        di1["abc"] = ICE_ENUM(Test::MyEnum, enum1);
+        di1[""] = ICE_ENUM(Test::MyEnum, enum2);
         Test::StringMyEnumD di2;
-        di2["abc"] = Test::enum1;
-        di2["qwerty"] = Test::enum3;
-        di2["Hello!!"] = Test::enum2;
+        di2["abc"] = ICE_ENUM(Test::MyEnum, enum1);
+        di2["qwerty"] = ICE_ENUM(Test::MyEnum, enum3);
+        di2["Hello!!"] = ICE_ENUM(Test::MyEnum, enum2);
         Test::StringMyEnumD di3;
-        di3["Goodbye"] = Test::enum1;
+        di3["Goodbye"] = ICE_ENUM(Test::MyEnum, enum1);
 
         dsi1[0] = di1;
         dsi1[1] = di2;
         dsi2[0] = di3;
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opStringMyEnumDS_async(dsi1, dsi2,
+            [&](Test::StringMyEnumDS dsi3, Test::StringMyEnumDS dsi4)
+            {
+                cb->opStringMyEnumDS(move(dsi3), move(dsi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opStringMyEnumDSPtr callback =
             Test::newCallback_MyClass_opStringMyEnumDS(cb, &Callback::opStringMyEnumDS, &Callback::exCB);
         p->begin_opStringMyEnumDS(dsi1, dsi2, callback);
+#endif
         cb->check();
     }
 
@@ -1619,21 +1947,30 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         dsi2.resize(1);
 
         Test::MyEnumStringD di1;
-        di1[Test::enum1] = "abc";
+        di1[ICE_ENUM(Test::MyEnum, enum1)] = "abc";
         Test::MyEnumStringD di2;
-        di2[Test::enum2] = "Hello!!";
-        di2[Test::enum3] = "qwerty";
+        di2[ICE_ENUM(Test::MyEnum, enum2)] = "Hello!!";
+        di2[ICE_ENUM(Test::MyEnum, enum3)] = "qwerty";
         Test::MyEnumStringD di3;
-        di3[Test::enum1] = "Goodbye";
+        di3[ICE_ENUM(Test::MyEnum, enum1)] = "Goodbye";
 
         dsi1[0] = di1;
         dsi1[1] = di2;
         dsi2[0] = di3;
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opMyEnumStringDS_async(dsi1, dsi2,
+            [&](Test::MyEnumStringDS dsi3, Test::MyEnumStringDS dsi4)
+            {
+                cb->opMyEnumStringDS(move(dsi3), move(dsi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opMyEnumStringDSPtr callback =
             Test::newCallback_MyClass_opMyEnumStringDS(cb, &Callback::opMyEnumStringDS, &Callback::exCB);
         p->begin_opMyEnumStringDS(dsi1, dsi2, callback);
+#endif
         cb->check();
     }
 
@@ -1646,27 +1983,36 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         Test::MyStruct s11 = { 1, 1 };
         Test::MyStruct s12 = { 1, 2 };
         Test::MyStructMyEnumD di1;
-        di1[s11] = Test::enum1;
-        di1[s12] = Test::enum2;
+        di1[s11] = ICE_ENUM(Test::MyEnum, enum1);
+        di1[s12] = ICE_ENUM(Test::MyEnum, enum2);
 
         Test::MyStruct s22 = { 2, 2 };
         Test::MyStruct s23 = { 2, 3 };
         Test::MyStructMyEnumD di2;
-        di2[s11] = Test::enum1;
-        di2[s22] = Test::enum3;
-        di2[s23] = Test::enum2;
+        di2[s11] = ICE_ENUM(Test::MyEnum, enum1);
+        di2[s22] = ICE_ENUM(Test::MyEnum, enum3);
+        di2[s23] = ICE_ENUM(Test::MyEnum, enum2);
 
         Test::MyStructMyEnumD di3;
-        di3[s23] = Test::enum3;
+        di3[s23] = ICE_ENUM(Test::MyEnum, enum3);
 
         dsi1[0] = di1;
         dsi1[1] = di2;
         dsi2[0] = di3;
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opMyStructMyEnumDS_async(dsi1, dsi2,
+            [&](Test::MyStructMyEnumDS dsi3, MyStructMyEnumDS dsi4)
+            {
+                cb->opMyStructMyEnumDS(move(dsi3), move(dsi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opMyStructMyEnumDSPtr callback =
             Test::newCallback_MyClass_opMyStructMyEnumDS(cb, &Callback::opMyStructMyEnumDS, &Callback::exCB);
         p->begin_opMyStructMyEnumDS(dsi1, dsi2, callback);
+#endif
         cb->check();
     }
 
@@ -1689,9 +2035,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         sdi2[Ice::Byte(0xf1)] = si3;
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opByteByteSD_async(sdi1, sdi2,
+            [&](Test::ByteByteSD sdi3, Test::ByteByteSD sdi4)
+            {
+                cb->opByteByteSD(move(sdi3), move(sdi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opByteByteSDPtr callback =
             Test::newCallback_MyClass_opByteByteSD(cb, &Callback::opByteByteSD, &Callback::exCB);
         p->begin_opByteByteSD(sdi1, sdi2, callback);
+#endif
         cb->check();
     }
 
@@ -1713,9 +2068,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         sdi2[false] = si1;
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opBoolBoolSD_async(sdi1, sdi2,
+            [&](Test::BoolBoolSD sdi3, Test::BoolBoolSD sdi4)
+            {
+                cb->opBoolBoolSD(move(sdi3), move(sdi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opBoolBoolSDPtr callback =
             Test::newCallback_MyClass_opBoolBoolSD(cb, &Callback::opBoolBoolSD, &Callback::exCB);
         p->begin_opBoolBoolSD(sdi1, sdi2, callback);
+#endif
         cb->check();
     }
 
@@ -1740,9 +2104,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         sdi2[4] = si3;
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opShortShortSD_async(sdi1, sdi2,
+            [&](Test::ShortShortSD sdi3, Test::ShortShortSD sdi4)
+            {
+                cb->opShortShortSD(move(sdi3), move(sdi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opShortShortSDPtr callback =
             Test::newCallback_MyClass_opShortShortSD(cb, &Callback::opShortShortSD, &Callback::exCB);
         p->begin_opShortShortSD(sdi1, sdi2, callback);
+#endif
         cb->check();
     }
 
@@ -1767,9 +2140,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         sdi2[400] = si3;
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opIntIntSD_async(sdi1, sdi2,
+            [&](Test::IntIntSD sdi3, Test::IntIntSD sdi4)
+            {
+                cb->opIntIntSD(move(sdi3), move(sdi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opIntIntSDPtr callback =
             Test::newCallback_MyClass_opIntIntSD(cb, &Callback::opIntIntSD, &Callback::exCB);
         p->begin_opIntIntSD(sdi1, sdi2, callback);
+#endif
         cb->check();
     }
 
@@ -1794,9 +2176,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         sdi2[999999992] = si3;
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opLongLongSD_async(sdi1, sdi2,
+            [&](Test::LongLongSD sdi3, Test::LongLongSD sdi4)
+            {
+                cb->opLongLongSD(move(sdi3), move(sdi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opLongLongSDPtr callback =
             Test::newCallback_MyClass_opLongLongSD(cb, &Callback::opLongLongSD, &Callback::exCB);
         p->begin_opLongLongSD(sdi1, sdi2, callback);
+#endif
         cb->check();
     }
 
@@ -1821,9 +2212,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         sdi2["aBc"] = si3;
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opStringFloatSD_async(sdi1, sdi2,
+            [&](Test::StringFloatSD sdi3, Test::StringFloatSD sdi4)
+            {
+                cb->opStringFloatSD(move(sdi3), move(sdi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opStringFloatSDPtr callback =
             Test::newCallback_MyClass_opStringFloatSD(cb, &Callback::opStringFloatSD, &Callback::exCB);
         p->begin_opStringFloatSD(sdi1, sdi2, callback);
+#endif
         cb->check();
     }
 
@@ -1848,9 +2248,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         sdi2[""] = si3;
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opStringDoubleSD_async(sdi1, sdi2,
+            [&](Test::StringDoubleSD sdi3, Test::StringDoubleSD sdi4)
+            {
+                cb->opStringDoubleSD(move(sdi3), move(sdi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opStringDoubleSDPtr callback =
             Test::newCallback_MyClass_opStringDoubleSD(cb, &Callback::opStringDoubleSD, &Callback::exCB);
         p->begin_opStringDoubleSD(sdi1, sdi2, callback);
+#endif
         cb->check();
     }
 
@@ -1877,9 +2286,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         sdi2["ghi"] = si3;
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opStringStringSD_async(sdi1, sdi2,
+            [&](Test::StringStringSD sdi3, Test::StringStringSD sdi4)
+            {
+                cb->opStringStringSD(move(sdi3), move(sdi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opStringStringSDPtr callback =
             Test::newCallback_MyClass_opStringStringSD(cb, &Callback::opStringStringSD, &Callback::exCB);
         p->begin_opStringStringSD(sdi1, sdi2, callback);
+#endif
         cb->check();
     }
 
@@ -1891,22 +2309,31 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         Test::MyEnumS si2;
         Test::MyEnumS si3;
 
-        si1.push_back(Test::enum1);
-        si1.push_back(Test::enum1);
-        si1.push_back(Test::enum2);
-        si2.push_back(Test::enum1);
-        si2.push_back(Test::enum2);
-        si3.push_back(Test::enum3);
-        si3.push_back(Test::enum3);
+        si1.push_back(ICE_ENUM(Test::MyEnum, enum1));
+        si1.push_back(ICE_ENUM(Test::MyEnum, enum1));
+        si1.push_back(ICE_ENUM(Test::MyEnum, enum2));
+        si2.push_back(ICE_ENUM(Test::MyEnum, enum1));
+        si2.push_back(ICE_ENUM(Test::MyEnum, enum2));
+        si3.push_back(ICE_ENUM(Test::MyEnum, enum3));
+        si3.push_back(ICE_ENUM(Test::MyEnum, enum3));
 
-        sdi1[Test::enum3] = si1;
-        sdi1[Test::enum2] = si2;
-        sdi2[Test::enum1] = si3;
+        sdi1[ICE_ENUM(Test::MyEnum, enum3)] = si1;
+        sdi1[ICE_ENUM(Test::MyEnum, enum2)] = si2;
+        sdi2[ICE_ENUM(Test::MyEnum, enum1)] = si3;
 
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opMyEnumMyEnumSD_async(sdi1, sdi2,
+            [&](Test::MyEnumMyEnumSD sdi3, Test::MyEnumMyEnumSD sdi4)
+            {
+                cb->opMyEnumMyEnumSD(move(sdi3), move(sdi4));
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opMyEnumMyEnumSDPtr callback =
             Test::newCallback_MyClass_opMyEnumMyEnumSD(cb, &Callback::opMyEnumMyEnumSD, &Callback::exCB);
         p->begin_opMyEnumMyEnumSD(sdi1, sdi2, callback);
+#endif
         cb->check();
     }
 
@@ -1921,9 +2348,18 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                 s.push_back(i);
             }
             CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+            p->opIntS_async(s,
+                [&](Test::IntS s1)
+                {
+                    cb->opIntS(s1);
+                },
+                makeExceptionClosure(cb));
+#else
             Test::Callback_MyClass_opIntSPtr callback =
                 Test::newCallback_MyClass_opIntS(cb, &Callback::opIntS, &Callback::exCB);
             p->begin_opIntS(s, callback);
+#endif
             cb->check();
         }
     }
@@ -1935,28 +2371,88 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         ctx["three"] = "THREE";
         {
             test(p->ice_getContext().empty());
+#ifdef ICE_CPP11_MAPPING
+            promise<void> prom;
+            p->opContext_async(
+                [&](Ice::Context c)
+                {
+                    test(c != ctx);
+                    prom.set_value();
+                },
+                [](exception_ptr)
+                {
+                    test(false);
+                });
+            prom.get_future().get();
+#else
             Ice::AsyncResultPtr r = p->begin_opContext();
             Ice::Context c = p->end_opContext(r);
             test(c != ctx);
+#endif
         }
         {
             test(p->ice_getContext().empty());
+#ifdef ICE_CPP11_MAPPING
+            promise<void> prom;
+            p->opContext_async(
+                [&](Ice::Context c)
+                {
+                    test(c == ctx);
+                    prom.set_value();
+                },
+                [](exception_ptr)
+                {
+                    test(false);
+                }, nullptr, ctx);
+            prom.get_future().get();
+#else
             Ice::AsyncResultPtr r = p->begin_opContext(ctx);
             Ice::Context c = p->end_opContext(r);
             test(c == ctx);
+#endif
         }
-        Test::MyClassPrx p2 = Test::MyClassPrx::checkedCast(p->ice_context(ctx));
+        Test::MyClassPrxPtr p2 = ICE_CHECKED_CAST(Test::MyClassPrx, p->ice_context(ctx));
         test(p2->ice_getContext() == ctx);
         {
+#ifdef ICE_CPP11_MAPPING
+            promise<void> prom;
+            p2->opContext_async(
+                [&](Ice::Context c)
+                {
+                    test(c == ctx);
+                    prom.set_value();
+                },
+                [](exception_ptr)
+                {
+                    test(false);
+                });
+            prom.get_future().get();
+#else
             Ice::AsyncResultPtr r = p2->begin_opContext();
             Ice::Context c = p2->end_opContext(r);
             test(c == ctx);
+#endif
         }
         {
-            Test::MyClassPrx p2 = Test::MyClassPrx::checkedCast(p->ice_context(ctx));
+            Test::MyClassPrxPtr p2 = ICE_CHECKED_CAST(Test::MyClassPrx, p->ice_context(ctx));
+#ifdef ICE_CPP11_MAPPING
+            promise<void> prom;
+            p2->opContext_async(
+                [&](Ice::Context c)
+                {
+                    test(c == ctx);
+                    prom.set_value();
+                },
+                [](exception_ptr)
+                {
+                    test(false);
+                }, nullptr, ctx);
+            prom.get_future().get();
+#else
             Ice::AsyncResultPtr r = p2->begin_opContext(ctx);
             Ice::Context c = p2->end_opContext(r);
             test(c == ctx);
+#endif
         }
 
 #ifndef ICE_OS_WINRT
@@ -1981,25 +2477,60 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                 ctx["three"] = "THREE";
 
 
-                Test::MyClassPrx p = Test::MyClassPrx::uncheckedCast(
-                    ic->stringToProxy("test:default -p 12010"));
-
-
+                Test::MyClassPrxPtr p = ICE_UNCHECKED_CAST(Test::MyClassPrx, ic->stringToProxy("test:default -p 12010"));
                 ic->getImplicitContext()->setContext(ctx);
                 test(ic->getImplicitContext()->getContext() == ctx);
                 {
+#ifdef ICE_CPP11_MAPPING
+                    promise<void> prom;
+                    p->opContext_async(
+                        [&](Ice::Context c)
+                        {
+                            test(c == ctx);
+                            prom.set_value();
+                        },
+                        [](exception_ptr)
+                        {
+                            test(false);
+                        });
+                    prom.get_future().get();
+#else
                     Ice::AsyncResultPtr r = p->begin_opContext();
                     Ice::Context c = p->end_opContext(r);
                     test(c == ctx);
+#endif
                 }
 
                 ic->getImplicitContext()->put("zero", "ZERO");
 
                 ctx = ic->getImplicitContext()->getContext();
                 {
+#ifdef ICE_CPP11_MAPPING
+                    promise<void> prom;
+                    p->opContext_async(
+                        [&](Ice::Context c)
+                        {
+                            test(c == ctx);
+                            prom.set_value();
+                        },
+                        [](exception_ptr ex)
+                        {
+                            try
+                            {
+                                rethrow_exception(ex);
+                            }
+                            catch(const Ice::Exception& e)
+                            {
+                                cerr << e << endl;
+                            }
+                            test(false);
+                        });
+                    prom.get_future().get();
+#else
                     Ice::AsyncResultPtr r = p->begin_opContext();
                     Ice::Context c = p->end_opContext(r);
                     test(c == ctx);
+#endif
                 }
 
                 Ice::Context prxContext;
@@ -2010,20 +2541,50 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                 combined.insert(ctx.begin(), ctx.end());
                 test(combined["one"] == "UN");
 
-                p = Test::MyClassPrx::uncheckedCast(p->ice_context(prxContext));
+                p = ICE_UNCHECKED_CAST(Test::MyClassPrx, p->ice_context(prxContext));
 
                 ic->getImplicitContext()->setContext(Ice::Context());
                 {
+#ifdef ICE_CPP11_MAPPING
+                    promise<void> prom;
+                    p->opContext_async(
+                        [&](Ice::Context c)
+                        {
+                            test(c == prxContext);
+                            prom.set_value();
+                        },
+                        [](exception_ptr)
+                        {
+                            test(false);
+                        });
+                    prom.get_future().get();
+#else
                     Ice::AsyncResultPtr r = p->begin_opContext();
                     Ice::Context c = p->end_opContext(r);
                     test(c == prxContext);
+#endif
                 }
 
                 ic->getImplicitContext()->setContext(ctx);
                 {
+#ifdef ICE_CPP11_MAPPING
+                    promise<void> prom;
+                    p->opContext_async(
+                        [&](Ice::Context c)
+                        {
+                            test(c == combined);
+                            prom.set_value();
+                        },
+                        [](exception_ptr)
+                        {
+                            test(false);
+                        });
+                    prom.get_future().get();
+#else
                     Ice::AsyncResultPtr r = p->begin_opContext();
                     Ice::Context c = p->end_opContext(r);
                     test(c == combined);
+#endif
                 }
 
                 ic->getImplicitContext()->setContext(Ice::Context());
@@ -2037,146 +2598,401 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         Ice::Double d = 1278312346.0 / 13.0;
         Test::DoubleS ds(5, d);
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opDoubleMarshaling_async(d, ds,
+            [&]()
+            {
+                cb->opDoubleMarshaling();
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opDoubleMarshalingPtr callback =
             Test::newCallback_MyClass_opDoubleMarshaling(cb, &Callback::opDoubleMarshaling, &Callback::exCB);
         p->begin_opDoubleMarshaling(d, ds, callback);
+#endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opIdempotent_async(
+            [&]()
+            {
+                cb->opIdempotent();
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opIdempotentPtr callback =
             Test::newCallback_MyClass_opIdempotent(cb, &Callback::opIdempotent, &Callback::exCB);
         p->begin_opIdempotent(callback);
+#endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        p->opNonmutating_async(
+            [&]()
+            {
+                cb->opNonmutating();
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyClass_opNonmutatingPtr callback =
             Test::newCallback_MyClass_opNonmutating(cb, &Callback::opNonmutating, &Callback::exCB);
         p->begin_opNonmutating(callback);
+#endif
         cb->check();
     }
 
     {
-        Test::MyDerivedClassPrx derived = Test::MyDerivedClassPrx::checkedCast(p);
+        Test::MyDerivedClassPrxPtr derived = ICE_CHECKED_CAST(Test::MyDerivedClassPrx, p);
         test(derived);
         CallbackPtr cb = new Callback;
+#ifdef ICE_CPP11_MAPPING
+        derived->opDerived_async(
+            [&]()
+            {
+                cb->opDerived();
+            },
+            makeExceptionClosure(cb));
+#else
         Test::Callback_MyDerivedClass_opDerivedPtr callback =
             Test::newCallback_MyDerivedClass_opDerived(cb, &Callback::opDerived, &Callback::exCB);
         derived->begin_opDerived(callback);
+#endif
         cb->check();
     }
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
 
     {
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->ice_ping_async();
+        try
+        {
+            f.get();
+            cb->ping();
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(const std::exception& ex)
+        {
+            cerr << ex.what() << endl;
+            test(false);
+        }
+#   else
         p->begin_ice_ping([=](){ cb->ping(); }, [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->ice_isA_async(Test::MyClass::ice_staticId());
+        try
+        {
+            cb->isA(f.get());
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_ice_isA(Test::MyClass::ice_staticId(), [=](bool isA){ cb->isA(isA); }, [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->ice_id_async();
+        try
+        {
+            cb->id(f.get());
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_ice_id([=](const string& id){ cb->id(id); }, [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->ice_ids_async();
+        try
+        {
+            cb->ids(f.get());
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_ice_ids([=](const Ice::StringSeq& ids){ cb->ids(ids); }, [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opVoid_async();
+        try
+        {
+            f.get();
+            cb->opVoid();
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opVoid([=](){ cb->opVoid(); }, [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opByte_async(Ice::Byte(0xff), Ice::Byte(0x0f));
+        try
+        {
+            auto r = f.get();
+            cb->opByte(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opByte(Ice::Byte(0xff), Ice::Byte(0x0f),
                         [=](const Ice::Byte& p1, const Ice::Byte& p2){ cb->opByte(p1, p2); },
                         [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opBool_async(true, false);
+        try
+        {
+            auto r = f.get();
+            cb->opBool(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         Test::Callback_MyClass_opBoolPtr callback = Test::newCallback_MyClass_opBool(cb,
                                                                                      &Callback::opBool,
                                                                                      &Callback::exCB);
         p->begin_opBool(true, false, [=](bool p1, bool p2){ cb->opBool(p1, p2); }, [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opShortIntLong_async(10, 11, 12);
+        try
+        {
+            auto r = f.get();
+            cb->opShortIntLong(r.returnValue, r.p4, r.p5, r.p6);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opShortIntLong(10, 11, 12,
                                 [=](Ice::Long p1, Ice::Short p2, Ice::Int p3, Ice::Long p4){ cb->opShortIntLong(p1, p2, p3, p4); },
                                 [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opFloatDouble_async(3.14f, 1.1E10);
+        try
+        {
+            auto r = f.get();
+            cb->opFloatDouble(r.returnValue, r.p3, r.p4);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opFloatDouble(Ice::Float(3.14), Ice::Double(1.1E10),
                                [=](Ice::Double p1, Ice::Float p2, Ice::Double p3){ cb->opFloatDouble(p1, p2, p3); },
                                [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opString_async("hello", "world");
+        try
+        {
+            auto r = f.get();
+            cb->opString(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opString("hello", "world",
                           [=](const string& p1, const string& p2){ cb->opString(p1, p2); },
                           [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
-        p->begin_opMyEnum(Test::enum2,
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opMyEnum_async(Test::MyEnum::enum2);
+        try
+        {
+            auto r = f.get();
+            cb->opMyEnum(r.returnValue, r.p2);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
+        p->begin_opMyEnum(ICE_ENUM(Test::MyEnum, enum2),
                           [=](Test::MyEnum p1, Test::MyEnum p2){ cb->opMyEnum(p1, p2); },
                           [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback(communicator);
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opMyClass_async(p);
+        try
+        {
+            auto r = f.get();
+            cb->opMyClass(r.returnValue, r.p2, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opMyClass(p,
                         [=](const Test::MyClassPrx& p1, const Test::MyClassPrx p2, const Test::MyClassPrx p3)
                             {
                                 cb->opMyClass(p1, p2, p3);
                             },
                         [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
     {
         Test::Structure si1;
         si1.p = p;
-        si1.e = Test::enum3;
+        si1.e = ICE_ENUM(Test::MyEnum, enum3);
         si1.s.s = "abc";
         Test::Structure si2;
         si2.p = 0;
-        si2.e = Test::enum2;
+        si2.e = ICE_ENUM(Test::MyEnum, enum2);
         si2.s.s = "def";
 
         CallbackPtr cb = new Callback(communicator);
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opStruct_async(si1, si2);
+        try
+        {
+            auto r = f.get();
+            cb->opStruct(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opStruct(si1, si2,
                             [=](const Test::Structure& p1, const Test::Structure& p2)
                                 {
                                     cb->opStruct(p1, p2);
                                 },
                             [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#endif
         cb->check();
     }
 
@@ -2195,6 +3011,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         bsi2.push_back(Ice::Byte(0xf4));
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opByteS_async(bsi1, bsi2);
+        try
+        {
+            auto r = f.get();
+            cb->opByteS(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         Test::Callback_MyClass_opByteSPtr callback = Test::newCallback_MyClass_opByteS(cb,
                                                                                        &Callback::opByteS,
                                                                                        &Callback::exCB);
@@ -2204,6 +3036,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                 cb->opByteS(p1, p2);
                             },
                         [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
@@ -2218,12 +3051,29 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         bsi2.push_back(false);
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opBoolS_async(bsi1, bsi2);
+        try
+        {
+            auto r = f.get();
+            cb->opBoolS(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opBoolS(bsi1, bsi2,
                             [=](const Test::BoolS& p1, const Test::BoolS& p2)
                                 {
                                     cb->opBoolS(p1, p2);
                                 },
                             [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
@@ -2246,12 +3096,29 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         lsi.push_back(20);
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opShortIntLongS_async(ssi, isi, lsi);
+        try
+        {
+            auto r = f.get();
+            cb->opShortIntLongS(r.returnValue, r.p4, r.p5, r.p6);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opShortIntLongS(ssi, isi, lsi,
                                 [=](const Test::LongS& p1, const Test::ShortS& p2, const Test::IntS& p3, const Test::LongS& p4)
                                     {
                                         cb->opShortIntLongS(p1, p2, p3, p4);
                                     },
                                 [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
@@ -2267,12 +3134,29 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         dsi.push_back(Ice::Double(1.3E10));
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opFloatDoubleS_async(fsi, dsi);
+        try
+        {
+            auto r = f.get();
+            cb->opFloatDoubleS(r.returnValue, r.p3, r.p4);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opFloatDoubleS(fsi, dsi,
                                 [=](const Test::DoubleS& p1, const Test::FloatS& p2, const Test::DoubleS& p3)
                                     {
                                         cb->opFloatDoubleS(p1, p2, p3);
                                     },
                                 [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
@@ -2287,12 +3171,29 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         ssi2.push_back("xyz");
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opStringS_async(ssi1, ssi2);
+        try
+        {
+            auto r = f.get();
+            cb->opStringS(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opStringS(ssi1, ssi2,
                             [=](const Test::StringS& p1, const Test::StringS& p2)
                                 {
                                     cb->opStringS(p1, p2);
                                 },
                             [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
@@ -2312,12 +3213,29 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         bsi2[1].push_back(Ice::Byte(0xf1));
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opByteSS_async(bsi1, bsi2);
+        try
+        {
+            auto r = f.get();
+            cb->opByteSS(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opByteSS(bsi1, bsi2,
                             [=](const Test::ByteSS& p1, const Test::ByteSS& p2)
                                 {
                                     cb->opByteSS(p1, p2);
                                 },
                             [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
@@ -2335,12 +3253,29 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         dsi[0].push_back(Ice::Double(1.3E10));
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opFloatDoubleSS_async(fsi, dsi);
+        try
+        {
+            auto r = f.get();
+            cb->opFloatDoubleSS(r.returnValue, r.p3, r.p4);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opFloatDoubleSS(fsi, dsi,
                                     [=](const Test::DoubleSS& p1, const Test::FloatSS& p2, const Test::DoubleSS& p3)
                                         {
                                             cb->opFloatDoubleSS(p1, p2, p3);
                                         },
                                     [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
@@ -2357,12 +3292,29 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         ssi2[2].push_back("xyz");
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opStringSS_async(ssi1, ssi2);
+        try
+        {
+            auto r = f.get();
+            cb->opStringSS(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opStringSS(ssi1, ssi2,
                                 [=](const Test::StringSS& p1, const Test::StringSS& p2)
                                     {
                                         cb->opStringSS(p1, p2);
                                     },
                                 [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
@@ -2376,6 +3328,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         di2[101] = true;
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opByteBoolD_async(di1, di2);
+        try
+        {
+            auto r = f.get();
+            cb->opByteBoolD(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opByteBoolD(di1, di2,
                                 [=](const Test::ByteBoolD& p1, const Test::ByteBoolD& p2)
                                     {
@@ -2385,6 +3353,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                     {
                                         cb->exCB(ex);
                                     });
+#   endif
         cb->check();
     }
 
@@ -2398,6 +3367,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         di2[1101] = 0;
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opShortIntD_async(di1, di2);
+        try
+        {
+            auto r = f.get();
+            cb->opShortIntD(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opShortIntD(di1, di2,
                                 [=](const Test::ShortIntD& p1, const Test::ShortIntD& p2)
                                     {
@@ -2407,6 +3392,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                     {
                                         cb->exCB(ex);
                                     });
+#   endif
         cb->check();
     }
 
@@ -2420,6 +3406,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         di2[999999130] = Ice::Float(0.5);
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opLongFloatD_async(di1, di2);
+        try
+        {
+            auto r = f.get();
+            cb->opLongFloatD(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opLongFloatD(di1, di2,
                                 [=](const Test::LongFloatD& p1, const Test::LongFloatD& p2)
                                     {
@@ -2429,6 +3431,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                     {
                                         cb->exCB(ex);
                                     });
+#   endif
         cb->check();
     }
 
@@ -2442,6 +3445,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         di2["BAR"] = "abc 0.5";
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opStringStringD_async(di1, di2);
+        try
+        {
+            auto r = f.get();
+            cb->opStringStringD(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opStringStringD(di1, di2,
                                     [=](const Test::StringStringD& p1, const Test::StringStringD& p2)
                                         {
@@ -2451,19 +3470,36 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
     }
 
     {
         Test::StringMyEnumD di1;
-        di1["abc"] = Test::enum1;
-        di1[""] = Test::enum2;
+        di1["abc"] = ICE_ENUM(Test::MyEnum, enum1);
+        di1[""] = ICE_ENUM(Test::MyEnum, enum2);
         Test::StringMyEnumD di2;
-        di2["abc"] = Test::enum1;
-        di2["qwerty"] = Test::enum3;
-        di2["Hello!!"] = Test::enum2;
+        di2["abc"] = ICE_ENUM(Test::MyEnum, enum1);
+        di2["qwerty"] = ICE_ENUM(Test::MyEnum, enum3);
+        di2["Hello!!"] = ICE_ENUM(Test::MyEnum, enum2);
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opStringMyEnumD_async(di1, di2);
+        try
+        {
+            auto r = f.get();
+            cb->opStringMyEnumD(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opStringMyEnumD(di1, di2,
                                     [=](const Test::StringMyEnumD& p1, const Test::StringMyEnumD& p2)
                                         {
@@ -2473,6 +3509,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
     }
 
@@ -2480,17 +3517,33 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         Test::MyStruct s11 = { 1, 1 };
         Test::MyStruct s12 = { 1, 2 };
         Test::MyStructMyEnumD di1;
-        di1[s11] = Test::enum1;
-        di1[s12] = Test::enum2;
+        di1[s11] = ICE_ENUM(Test::MyEnum, enum1);
+        di1[s12] = ICE_ENUM(Test::MyEnum, enum2);
 
         Test::MyStruct s22 = { 2, 2 };
         Test::MyStruct s23 = { 2, 3 };
         Test::MyStructMyEnumD di2;
-        di2[s11] = Test::enum1;
-        di2[s22] = Test::enum3;
-        di2[s23] = Test::enum2;
+        di2[s11] = ICE_ENUM(Test::MyEnum, enum1);
+        di2[s22] = ICE_ENUM(Test::MyEnum, enum3);
+        di2[s23] = ICE_ENUM(Test::MyEnum, enum2);
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opMyStructMyEnumD_async(di1, di2);
+        try
+        {
+            auto r = f.get();
+            cb->opMyStructMyEnumD(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opMyStructMyEnumD(di1, di2,
                                     [=](const Test::MyStructMyEnumD& p1, const Test::MyStructMyEnumD& p2)
                                         {
@@ -2500,6 +3553,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
     }
 
@@ -2525,6 +3579,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         dsi2[0] = di3;
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opByteBoolDS_async(dsi1, dsi2);
+        try
+        {
+            auto r = f.get();
+            cb->opByteBoolDS(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opByteBoolDS(dsi1, dsi2,
                                     [=](const Test::ByteBoolDS& p1, const Test::ByteBoolDS& p2)
                                         {
@@ -2534,6 +3604,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
     }
 
@@ -2558,6 +3629,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         dsi2[0] = di3;
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opShortIntDS_async(dsi1, dsi2);
+        try
+        {
+            auto r = f.get();
+            cb->opShortIntDS(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opShortIntDS(dsi1, dsi2,
                                     [=](const Test::ShortIntDS& p1, const Test::ShortIntDS& p2)
                                         {
@@ -2567,6 +3654,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
     }
 
@@ -2591,6 +3679,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         dsi2[0] = di3;
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opLongFloatDS_async(dsi1, dsi2);
+        try
+        {
+            auto r = f.get();
+            cb->opLongFloatDS(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opLongFloatDS(dsi1, dsi2,
                                     [=](const Test::LongFloatDS& p1, const Test::LongFloatDS& p2)
                                         {
@@ -2600,6 +3704,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
     }
 
@@ -2624,6 +3729,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         dsi2[0] = di3;
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opStringStringDS_async(dsi1, dsi2);
+        try
+        {
+            auto r = f.get();
+            cb->opStringStringDS(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opStringStringDS(dsi1, dsi2,
                                     [=](const Test::StringStringDS& p1, const Test::StringStringDS& p2)
                                         {
@@ -2633,6 +3754,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
     }
 
@@ -2643,20 +3765,36 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         dsi2.resize(1);
 
         Test::StringMyEnumD di1;
-        di1["abc"] = Test::enum1;
-        di1[""] = Test::enum2;
+        di1["abc"] = ICE_ENUM(Test::MyEnum, enum1);
+        di1[""] = ICE_ENUM(Test::MyEnum, enum2);
         Test::StringMyEnumD di2;
-        di2["abc"] = Test::enum1;
-        di2["qwerty"] = Test::enum3;
-        di2["Hello!!"] = Test::enum2;
+        di2["abc"] = ICE_ENUM(Test::MyEnum, enum1);
+        di2["qwerty"] = ICE_ENUM(Test::MyEnum, enum3);
+        di2["Hello!!"] = ICE_ENUM(Test::MyEnum, enum2);
         Test::StringMyEnumD di3;
-        di3["Goodbye"] = Test::enum1;
+        di3["Goodbye"] = ICE_ENUM(Test::MyEnum, enum1);
 
         dsi1[0] = di1;
         dsi1[1] = di2;
         dsi2[0] = di3;
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opStringMyEnumDS_async(dsi1, dsi2);
+        try
+        {
+            auto r = f.get();
+            cb->opStringMyEnumDS(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opStringMyEnumDS(dsi1, dsi2,
                                     [=](const Test::StringMyEnumDS& p1, const Test::StringMyEnumDS& p2)
                                         {
@@ -2666,6 +3804,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
     }
 
@@ -2676,18 +3815,34 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         dsi2.resize(1);
 
         Test::MyEnumStringD di1;
-        di1[Test::enum1] = "abc";
+        di1[ICE_ENUM(Test::MyEnum, enum1)] = "abc";
         Test::MyEnumStringD di2;
-        di2[Test::enum2] = "Hello!!";
-        di2[Test::enum3] = "qwerty";
+        di2[ICE_ENUM(Test::MyEnum, enum2)] = "Hello!!";
+        di2[ICE_ENUM(Test::MyEnum, enum3)] = "qwerty";
         Test::MyEnumStringD di3;
-        di3[Test::enum1] = "Goodbye";
+        di3[ICE_ENUM(Test::MyEnum, enum1)] = "Goodbye";
 
         dsi1[0] = di1;
         dsi1[1] = di2;
         dsi2[0] = di3;
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opMyEnumStringDS_async(dsi1, dsi2);
+        try
+        {
+            auto r = f.get();
+            cb->opMyEnumStringDS(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opMyEnumStringDS(dsi1, dsi2,
                                     [=](const Test::MyEnumStringDS& p1, const Test::MyEnumStringDS& p2)
                                         {
@@ -2697,6 +3852,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
     }
 
@@ -2709,24 +3865,40 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         Test::MyStruct s11 = { 1, 1 };
         Test::MyStruct s12 = { 1, 2 };
         Test::MyStructMyEnumD di1;
-        di1[s11] = Test::enum1;
-        di1[s12] = Test::enum2;
+        di1[s11] = ICE_ENUM(Test::MyEnum, enum1);
+        di1[s12] = ICE_ENUM(Test::MyEnum, enum2);
 
         Test::MyStruct s22 = { 2, 2 };
         Test::MyStruct s23 = { 2, 3 };
         Test::MyStructMyEnumD di2;
-        di2[s11] = Test::enum1;
-        di2[s22] = Test::enum3;
-        di2[s23] = Test::enum2;
+        di2[s11] = ICE_ENUM(Test::MyEnum, enum1);
+        di2[s22] = ICE_ENUM(Test::MyEnum, enum3);
+        di2[s23] = ICE_ENUM(Test::MyEnum, enum2);
 
         Test::MyStructMyEnumD di3;
-        di3[s23] = Test::enum3;
+        di3[s23] = ICE_ENUM(Test::MyEnum, enum3);
 
         dsi1[0] = di1;
         dsi1[1] = di2;
         dsi2[0] = di3;
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opMyStructMyEnumDS_async(dsi1, dsi2);
+        try
+        {
+            auto r = f.get();
+            cb->opMyStructMyEnumDS(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opMyStructMyEnumDS(dsi1, dsi2,
                                     [=](const Test::MyStructMyEnumDS& p1, const Test::MyStructMyEnumDS& p2)
                                         {
@@ -2736,6 +3908,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
     }
 
@@ -2758,6 +3931,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         sdi2[Ice::Byte(0xf1)] = si3;
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opByteByteSD_async(sdi1, sdi2);
+        try
+        {
+            auto r = f.get();
+            cb->opByteByteSD(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opByteByteSD(sdi1, sdi2,
                                     [=](const Test::ByteByteSD& p1, const Test::ByteByteSD& p2)
                                         {
@@ -2767,6 +3956,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
     }
 
@@ -2788,6 +3978,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         sdi2[false] = si1;
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opBoolBoolSD_async(sdi1, sdi2);
+        try
+        {
+            auto r = f.get();
+            cb->opBoolBoolSD(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opBoolBoolSD(sdi1, sdi2,
                                     [=](const Test::BoolBoolSD& p1, const Test::BoolBoolSD& p2)
                                         {
@@ -2797,6 +4003,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
     }
 
@@ -2821,6 +4028,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         sdi2[4] = si3;
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opShortShortSD_async(sdi1, sdi2);
+        try
+        {
+            auto r = f.get();
+            cb->opShortShortSD(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opShortShortSD(sdi1, sdi2,
                                     [=](const Test::ShortShortSD& p1, const Test::ShortShortSD& p2)
                                         {
@@ -2830,6 +4053,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
     }
 
@@ -2854,6 +4078,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         sdi2[400] = si3;
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opIntIntSD_async(sdi1, sdi2);
+        try
+        {
+            auto r = f.get();
+            cb->opIntIntSD(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opIntIntSD(sdi1, sdi2,
                                     [=](const Test::IntIntSD& p1, const Test::IntIntSD& p2)
                                         {
@@ -2863,6 +4103,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
     }
 
@@ -2887,6 +4128,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         sdi2[999999992] = si3;
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opLongLongSD_async(sdi1, sdi2);
+        try
+        {
+            auto r = f.get();
+            cb->opLongLongSD(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opLongLongSD(sdi1, sdi2,
                                     [=](const Test::LongLongSD& p1, const Test::LongLongSD& p2)
                                         {
@@ -2896,6 +4153,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
     }
 
@@ -2920,6 +4178,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         sdi2["aBc"] = si3;
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opStringFloatSD_async(sdi1, sdi2);
+        try
+        {
+            auto r = f.get();
+            cb->opStringFloatSD(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opStringFloatSD(sdi1, sdi2,
                                     [=](const Test::StringFloatSD& p1, const Test::StringFloatSD& p2)
                                         {
@@ -2929,6 +4203,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
     }
 
@@ -2953,6 +4228,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         sdi2[""] = si3;
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opStringDoubleSD_async(sdi1, sdi2);
+        try
+        {
+            auto r = f.get();
+            cb->opStringDoubleSD(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opStringDoubleSD(sdi1, sdi2,
                                     [=](const Test::StringDoubleSD& p1, const Test::StringDoubleSD& p2)
                                         {
@@ -2962,6 +4253,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
     }
 
@@ -2988,6 +4280,22 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         sdi2["ghi"] = si3;
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opStringStringSD_async(sdi1, sdi2);
+        try
+        {
+            auto r = f.get();
+            cb->opStringStringSD(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opStringStringSD(sdi1, sdi2,
                                     [=](const Test::StringStringSD& p1, const Test::StringStringSD& p2)
                                         {
@@ -2997,6 +4305,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
 
     }
@@ -3009,19 +4318,35 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         Test::MyEnumS si2;
         Test::MyEnumS si3;
 
-        si1.push_back(Test::enum1);
-        si1.push_back(Test::enum1);
-        si1.push_back(Test::enum2);
-        si2.push_back(Test::enum1);
-        si2.push_back(Test::enum2);
-        si3.push_back(Test::enum3);
-        si3.push_back(Test::enum3);
+        si1.push_back(ICE_ENUM(Test::MyEnum, enum1));
+        si1.push_back(ICE_ENUM(Test::MyEnum, enum1));
+        si1.push_back(ICE_ENUM(Test::MyEnum, enum2));
+        si2.push_back(ICE_ENUM(Test::MyEnum, enum1));
+        si2.push_back(ICE_ENUM(Test::MyEnum, enum2));
+        si3.push_back(ICE_ENUM(Test::MyEnum, enum3));
+        si3.push_back(ICE_ENUM(Test::MyEnum, enum3));
 
-        sdi1[Test::enum3] = si1;
-        sdi1[Test::enum2] = si2;
-        sdi2[Test::enum1] = si3;
+        sdi1[ICE_ENUM(Test::MyEnum, enum3)] = si1;
+        sdi1[ICE_ENUM(Test::MyEnum, enum2)] = si2;
+        sdi2[ICE_ENUM(Test::MyEnum, enum1)] = si3;
 
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opMyEnumMyEnumSD_async(sdi1, sdi2);
+        try
+        {
+            auto r = f.get();
+            cb->opMyEnumMyEnumSD(r.returnValue, r.p3);
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opMyEnumMyEnumSD(sdi1, sdi2,
                                     [=](const Test::MyEnumMyEnumSD& p1, const Test::MyEnumMyEnumSD& p2)
                                         {
@@ -3031,6 +4356,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                         {
                                             cb->exCB(ex);
                                         });
+#   endif
         cb->check();
     }
 
@@ -3045,6 +4371,21 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                 s.push_back(i);
             }
             CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+            auto f = p->opIntS_async(s);
+            try
+            {
+                cb->opIntS(f.get());
+            }
+            catch(const Ice::Exception& ex)
+            {
+                cb->exCB(ex);
+            }
+            catch(...)
+            {
+                test(false);
+            }
+#   else
             p->begin_opIntS(s,
                             [=](const Test::IntS& p1)
                                 {
@@ -3054,6 +4395,7 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
                                 {
                                     cb->exCB(ex);
                                 });
+#   endif
             cb->check();
         }
     }
@@ -3062,34 +4404,100 @@ twowaysAMI(const Ice::CommunicatorPtr& communicator, const Test::MyClassPrx& p)
         Ice::Double d = 1278312346.0 / 13.0;
         Test::DoubleS ds(5, d);
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opDoubleMarshaling_async(d, ds);
+        try
+        {
+            f.get();
+            cb->opDoubleMarshaling();
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opDoubleMarshaling(d, ds,
                                     [=](){ cb->opDoubleMarshaling(); },
                                     [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
-        Test::Callback_MyClass_opIdempotentPtr callback =
-            Test::newCallback_MyClass_opIdempotent(cb, &Callback::opIdempotent, &Callback::exCB);
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opIdempotent_async();
+        try
+        {
+            f.get();
+            cb->opIdempotent();
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opIdempotent([=](){ cb->opIdempotent(); },
                               [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
     {
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = p->opNonmutating_async();
+        try
+        {
+            f.get();
+            cb->opNonmutating();
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         p->begin_opNonmutating([=](){ cb->opNonmutating(); },
                                [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 
     {
-        Test::MyDerivedClassPrx derived = Test::MyDerivedClassPrx::checkedCast(p);
+        Test::MyDerivedClassPrxPtr derived = ICE_CHECKED_CAST(Test::MyDerivedClassPrx, p);
         test(derived);
         CallbackPtr cb = new Callback;
+#   ifdef ICE_CPP11_MAPPING
+        auto f = derived->opDerived_async();
+        try
+        {
+            f.get();
+            cb->opDerived();
+        }
+        catch(const Ice::Exception& ex)
+        {
+            cb->exCB(ex);
+        }
+        catch(...)
+        {
+            test(false);
+        }
+#   else
         derived->begin_opDerived([=](){ cb->opDerived(); },
                                  [=](const Ice::Exception& ex){ cb->exCB(ex); });
+#   endif
         cb->check();
     }
 #endif
diff --git a/cpp/test/Ice/optional/.depend.mak b/cpp/test/Ice/optional/.depend.mak
index f6c19062c23..8283d3a8e32 100755
--- a/cpp/test/Ice/optional/.depend.mak
+++ b/cpp/test/Ice/optional/.depend.mak
@@ -19,6 +19,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -27,6 +28,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -61,7 +63,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -70,13 +72,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.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" \
     "CustomMap.h" \
     "StringView.h" \
     "$(includedir)\Ice\Ice.h" \
@@ -120,7 +122,6 @@ Test.obj: \
     "$(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" \
@@ -147,6 +148,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -155,6 +157,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -195,7 +198,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -209,6 +212,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -220,7 +224,6 @@ TestI.obj: \
     "$(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" \
@@ -243,7 +246,6 @@ TestI.obj: \
     "$(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" \
@@ -273,6 +275,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -281,6 +284,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -321,7 +325,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -335,6 +339,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -346,7 +351,6 @@ Client.obj: \
     "$(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" \
@@ -369,7 +373,6 @@ Client.obj: \
     "$(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" \
@@ -404,6 +407,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -412,6 +416,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -452,7 +457,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -466,6 +471,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -477,7 +483,6 @@ AllTests.obj: \
     "$(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" \
@@ -500,7 +505,6 @@ AllTests.obj: \
     "$(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" \
@@ -534,6 +538,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -542,6 +547,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -582,7 +588,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -596,6 +602,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -607,7 +614,6 @@ Server.obj: \
     "$(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" \
@@ -630,7 +636,6 @@ Server.obj: \
     "$(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" \
@@ -663,6 +668,7 @@ TestAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -671,6 +677,7 @@ TestAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -705,7 +712,7 @@ TestAMD.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -714,6 +721,7 @@ TestAMD.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -721,7 +729,6 @@ TestAMD.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "CustomMap.h" \
     "StringView.h" \
     "$(includedir)\Ice\Ice.h" \
@@ -764,7 +771,6 @@ TestAMD.obj: \
     "$(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" \
@@ -791,6 +797,7 @@ TestAMDI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -799,6 +806,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -839,7 +847,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -853,6 +861,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -864,7 +873,6 @@ TestAMDI.obj: \
     "$(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" \
@@ -887,7 +895,6 @@ TestAMDI.obj: \
     "$(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" \
@@ -917,6 +924,7 @@ ServerAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -925,6 +933,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -965,7 +974,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -979,6 +988,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -990,7 +1000,6 @@ ServerAMD.obj: \
     "$(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" \
@@ -1013,7 +1022,6 @@ ServerAMD.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/optional/CustomMap.h b/cpp/test/Ice/optional/CustomMap.h
index ba097ce2d1e..863fcf5101d 100644
--- a/cpp/test/Ice/optional/CustomMap.h
+++ b/cpp/test/Ice/optional/CustomMap.h
@@ -12,7 +12,7 @@
 
 #include <IceUtil/Config.h>
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
 #   include <unordered_map>
 #else
 #   include <map>
@@ -21,7 +21,7 @@
 namespace Test
 {
 
-#ifdef ICE_CPP11
+#ifdef ICE_CPP11_COMPILER
 template<typename K, typename V>
 class CustomMap : public std::unordered_map<K, V>
 {
diff --git a/cpp/test/Ice/plugin/.depend.mak b/cpp/test/Ice/plugin/.depend.mak
index 533ca1adef5..bc8a2cd7584 100755
--- a/cpp/test/Ice/plugin/.depend.mak
+++ b/cpp/test/Ice/plugin/.depend.mak
@@ -15,6 +15,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -23,6 +24,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -63,7 +65,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -77,6 +79,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -88,7 +91,6 @@ Client.obj: \
     "$(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" \
@@ -111,7 +113,6 @@ Client.obj: \
     "$(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" \
@@ -142,6 +143,7 @@ Plugin.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -150,6 +152,7 @@ Plugin.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -190,7 +193,7 @@ Plugin.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -204,6 +207,7 @@ Plugin.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -215,7 +219,6 @@ Plugin.obj: \
     "$(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" \
@@ -238,7 +241,6 @@ Plugin.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/properties/.depend.mak b/cpp/test/Ice/properties/.depend.mak
index 13e5e3347b1..ba2e103148d 100755
--- a/cpp/test/Ice/properties/.depend.mak
+++ b/cpp/test/Ice/properties/.depend.mak
@@ -15,6 +15,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -23,6 +24,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -63,7 +65,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -77,6 +79,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -88,7 +91,6 @@ Client.obj: \
     "$(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" \
@@ -111,7 +113,6 @@ Client.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/proxy/.depend.mak b/cpp/test/Ice/proxy/.depend.mak
index 4b298f8f995..f38c3b9ccfe 100755
--- a/cpp/test/Ice/proxy/.depend.mak
+++ b/cpp/test/Ice/proxy/.depend.mak
@@ -29,6 +29,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -37,6 +38,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -71,7 +73,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -80,13 +82,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -109,6 +111,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -117,6 +120,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -157,7 +161,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -171,6 +175,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -182,7 +187,6 @@ Client.obj: \
     "$(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" \
@@ -205,7 +209,6 @@ Client.obj: \
     "$(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" \
@@ -237,6 +240,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -245,6 +249,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -285,7 +290,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -299,6 +304,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -310,7 +316,6 @@ AllTests.obj: \
     "$(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" \
@@ -333,7 +338,6 @@ AllTests.obj: \
     "$(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" \
@@ -365,6 +369,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -373,6 +378,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -413,7 +419,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -427,6 +433,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -438,7 +445,6 @@ TestI.obj: \
     "$(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" \
@@ -461,7 +467,6 @@ TestI.obj: \
     "$(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" \
@@ -494,6 +499,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -502,6 +508,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -542,7 +549,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -556,6 +563,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -567,7 +575,6 @@ Server.obj: \
     "$(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" \
@@ -590,7 +597,6 @@ Server.obj: \
     "$(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" \
@@ -621,6 +627,7 @@ TestAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -629,6 +636,7 @@ TestAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -663,7 +671,7 @@ TestAMD.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -672,6 +680,7 @@ TestAMD.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -679,7 +688,6 @@ TestAMD.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -702,6 +710,7 @@ TestAMDI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -710,6 +719,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -750,7 +760,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -764,6 +774,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -775,7 +786,6 @@ TestAMDI.obj: \
     "$(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" \
@@ -798,7 +808,6 @@ TestAMDI.obj: \
     "$(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" \
@@ -831,6 +840,7 @@ ServerAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -839,6 +849,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -879,7 +890,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -893,6 +904,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -904,7 +916,6 @@ ServerAMD.obj: \
     "$(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" \
@@ -927,7 +938,6 @@ ServerAMD.obj: \
     "$(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" \
@@ -960,6 +970,7 @@ Collocated.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -968,6 +979,7 @@ Collocated.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1008,7 +1020,7 @@ Collocated.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1022,6 +1034,7 @@ Collocated.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1033,7 +1046,6 @@ Collocated.obj: \
     "$(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" \
@@ -1056,7 +1068,6 @@ Collocated.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/proxy/AllTests.cpp b/cpp/test/Ice/proxy/AllTests.cpp
index 545dc04037d..d324135ac83 100644
--- a/cpp/test/Ice/proxy/AllTests.cpp
+++ b/cpp/test/Ice/proxy/AllTests.cpp
@@ -10,20 +10,21 @@
 #include <Ice/Ice.h>
 #include <Ice/Locator.h>
 #include <Ice/Router.h>
+#include <Ice/EndpointI.h>
 #include <TestCommon.h>
 #include <Test.h>
 
 using namespace std;
 
-Test::MyClassPrx
+Test::MyClassPrxPtr
 allTests(const Ice::CommunicatorPtr& communicator)
 {
     cout << "testing stringToProxy... " << flush;
     string ref = "test:default -p 12010";
-    Ice::ObjectPrx base = communicator->stringToProxy(ref);
+    Ice::ObjectPrxPtr base = communicator->stringToProxy(ref);
     test(base);
 
-    Ice::ObjectPrx b1 = communicator->stringToProxy("test");
+    Ice::ObjectPrxPtr b1 = communicator->stringToProxy("test");
     test(b1->ice_getIdentity().name == "test" && b1->ice_getIdentity().category.empty() &&
          b1->ice_getAdapterId().empty() && b1->ice_getFacet().empty());
     b1 = communicator->stringToProxy("test ");
@@ -389,7 +390,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     b1 = b1->ice_invocationTimeout(1234);
     Ice::EncodingVersion v = { 1, 0 };
     b1 = b1->ice_encodingVersion(v);
-    Ice::ObjectPrx router = communicator->stringToProxy("router");
+    Ice::ObjectPrxPtr router = communicator->stringToProxy("router");
     router = router->ice_collocationOptimized(false);
     router = router->ice_connectionCached(true);
     router = router->ice_preferSecure(true);
@@ -397,7 +398,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     router = router->ice_locatorCacheTimeout(200);
     router = router->ice_invocationTimeout(1500);
 
-    Ice::ObjectPrx locator = communicator->stringToProxy("locator");
+    Ice::ObjectPrxPtr locator = communicator->stringToProxy("locator");
     locator = locator->ice_collocationOptimized(true);
     locator = locator->ice_connectionCached(false);
     locator = locator->ice_preferSecure(true);
@@ -405,8 +406,8 @@ allTests(const Ice::CommunicatorPtr& communicator)
     locator = locator->ice_locatorCacheTimeout(300);
     locator = locator->ice_invocationTimeout(1500);
 
-    locator = locator->ice_router(Ice::RouterPrx::uncheckedCast(router));
-    b1 = b1->ice_locator(Ice::LocatorPrx::uncheckedCast(locator));
+    locator = locator->ice_router(ICE_UNCHECKED_CAST(Ice::RouterPrx, router));
+    b1 = b1->ice_locator(ICE_UNCHECKED_CAST(Ice::LocatorPrx, locator));
 
     Ice::PropertyDict proxyProps = communicator->proxyToProperty(b1, "Test");
     test(proxyProps.size() == 21);
@@ -548,12 +549,195 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
     cout << "testing proxy comparison... " << flush;
 
+#ifdef ICE_CPP11_MAPPING
+    test(Ice::targetEquals(communicator->stringToProxy("foo"), communicator->stringToProxy("foo")));
+    test(!Ice::targetEquals(communicator->stringToProxy("foo"), communicator->stringToProxy("foo2")));
+    test(Ice::targetLess(communicator->stringToProxy("foo"), communicator->stringToProxy("foo2")));
+    test(!Ice::targetLess(communicator->stringToProxy("foo2"), communicator->stringToProxy("foo")));
+
+    Ice::ObjectPrxPtr compObj = communicator->stringToProxy("foo");
+
+    test(Ice::targetEquals(compObj->ice_facet("facet"), compObj->ice_facet("facet")));
+    test(!Ice::targetEquals(compObj->ice_facet("facet"), compObj->ice_facet("facet1")));
+    test(Ice::targetLess(compObj->ice_facet("facet"), compObj->ice_facet("facet1")));
+    test(!Ice::targetLess(compObj->ice_facet("facet"), compObj->ice_facet("facet")));
+
+    test(Ice::targetEquals(compObj->ice_oneway(), compObj->ice_oneway()));
+    test(!Ice::targetEquals(compObj->ice_oneway(), compObj->ice_twoway()));
+    test(Ice::targetLess(compObj->ice_twoway(), compObj->ice_oneway()));
+    test(!Ice::targetLess(compObj->ice_oneway(), compObj->ice_twoway()));
+
+    test(Ice::targetEquals(compObj->ice_secure(true), compObj->ice_secure(true)));
+    test(!Ice::targetEquals(compObj->ice_secure(false), compObj->ice_secure(true)));
+    test(Ice::targetLess(compObj->ice_secure(false), compObj->ice_secure(true)));
+    test(!Ice::targetLess(compObj->ice_secure(true), compObj->ice_secure(false)));
+
+    test(Ice::targetEquals(compObj->ice_collocationOptimized(true), compObj->ice_collocationOptimized(true)));
+    test(!Ice::targetEquals(compObj->ice_collocationOptimized(false), compObj->ice_collocationOptimized(true)));
+    test(Ice::targetLess(compObj->ice_collocationOptimized(false), compObj->ice_collocationOptimized(true)));
+    test(!Ice::targetLess(compObj->ice_collocationOptimized(true), compObj->ice_collocationOptimized(false)));
+
+    test(Ice::targetEquals(compObj->ice_connectionCached(true), compObj->ice_connectionCached(true)));
+    test(!Ice::targetEquals(compObj->ice_connectionCached(false), compObj->ice_connectionCached(true)));
+    test(Ice::targetLess(compObj->ice_connectionCached(false), compObj->ice_connectionCached(true)));
+    test(!Ice::targetLess(compObj->ice_connectionCached(true), compObj->ice_connectionCached(false)));
+
+    test(Ice::targetEquals(compObj->ice_endpointSelection(Ice::Random), compObj->ice_endpointSelection(Ice::Random)));
+    test(!Ice::targetEquals(compObj->ice_endpointSelection(Ice::Random), compObj->ice_endpointSelection(Ice::Ordered)));
+    test(Ice::targetLess(compObj->ice_endpointSelection(Ice::Random), compObj->ice_endpointSelection(Ice::Ordered)));
+    test(!Ice::targetLess(compObj->ice_endpointSelection(Ice::Ordered), compObj->ice_endpointSelection(Ice::Random)));
+
+    test(Ice::targetEquals(compObj->ice_connectionId("id2"), compObj->ice_connectionId("id2")));
+    test(!Ice::targetEquals(compObj->ice_connectionId("id1"), compObj->ice_connectionId("id2")));
+    test(Ice::targetLess(compObj->ice_connectionId("id1"), compObj->ice_connectionId("id2")));
+    test(!Ice::targetLess(compObj->ice_connectionId("id2"), compObj->ice_connectionId("id1")));
+
+    test(compObj->ice_connectionId("id1")->ice_getConnectionId() == "id1");
+    test(compObj->ice_connectionId("id2")->ice_getConnectionId() == "id2");
+
+    test(Ice::targetEquals(compObj->ice_compress(true), compObj->ice_compress(true)));
+    test(!Ice::targetEquals(compObj->ice_compress(false), compObj->ice_compress(true)));
+    test(Ice::targetLess(compObj->ice_compress(false), compObj->ice_compress(true)));
+    test(!Ice::targetLess(compObj->ice_compress(true), compObj->ice_compress(false)));
+
+    test(Ice::targetEquals(compObj->ice_timeout(20), compObj->ice_timeout(20)));
+    test(!Ice::targetEquals(compObj->ice_timeout(10), compObj->ice_timeout(20)));
+    test(Ice::targetLess(compObj->ice_timeout(10), compObj->ice_timeout(20)));
+    test(!Ice::targetLess(compObj->ice_timeout(20), compObj->ice_timeout(10)));
+
+    auto loc1 = Ice::uncheckedCast<Ice::LocatorPrx>(communicator->stringToProxy("loc1:default -p 10000"));
+    auto loc2 = Ice::uncheckedCast<Ice::LocatorPrx>(communicator->stringToProxy("loc2:default -p 10000"));
+
+    test(Ice::targetEquals(compObj->ice_locator(0), compObj->ice_locator(0)));
+    test(Ice::targetEquals(compObj->ice_locator(loc1), compObj->ice_locator(loc1)));
+    test(!Ice::targetEquals(compObj->ice_locator(loc1), compObj->ice_locator(0)));
+    test(!Ice::targetEquals(compObj->ice_locator(0), compObj->ice_locator(loc2)));
+    test(!Ice::targetEquals(compObj->ice_locator(loc1), compObj->ice_locator(loc2)));
+    test(Ice::targetLess(compObj->ice_locator(0), compObj->ice_locator(loc1)));
+    test(!Ice::targetLess(compObj->ice_locator(loc1), compObj->ice_locator(0)));
+    test(Ice::targetLess(compObj->ice_locator(loc1), compObj->ice_locator(loc2)));
+    test(!Ice::targetLess(compObj->ice_locator(loc2), compObj->ice_locator(loc1)));
+
+    auto rtr1 = Ice::uncheckedCast<Ice::RouterPrx>(communicator->stringToProxy("rtr1:default -p 10000"));
+    auto rtr2 = Ice::uncheckedCast<Ice::RouterPrx>(communicator->stringToProxy("rtr2:default -p 10000"));
+
+    test(Ice::targetEquals(compObj->ice_router(0), compObj->ice_router(0)));
+    test(Ice::targetEquals(compObj->ice_router(rtr1), compObj->ice_router(rtr1)));
+    test(!Ice::targetEquals(compObj->ice_router(rtr1), compObj->ice_router(0)));
+    test(!Ice::targetEquals(compObj->ice_router(0), compObj->ice_router(rtr2)));
+    test(!Ice::targetEquals(compObj->ice_router(rtr1), compObj->ice_router(rtr2)));
+    test(Ice::targetLess(compObj->ice_router(0), compObj->ice_router(rtr1)));
+    test(!Ice::targetLess(compObj->ice_router(rtr1), compObj->ice_router(0)));
+    test(Ice::targetLess(compObj->ice_router(rtr1), compObj->ice_router(rtr2)));
+    test(!Ice::targetLess(compObj->ice_router(rtr2), compObj->ice_router(rtr1)));
+
+    Ice::Context ctx1;
+    ctx1["ctx1"] = "v1";
+    Ice::Context ctx2;
+    ctx2["ctx2"] = "v2";
+    test(Ice::targetEquals(compObj->ice_context(Ice::Context()), compObj->ice_context(Ice::Context())));
+    test(Ice::targetEquals(compObj->ice_context(ctx1), compObj->ice_context(ctx1)));
+    test(!Ice::targetEquals(compObj->ice_context(ctx1), compObj->ice_context(Ice::Context())));
+    test(!Ice::targetEquals(compObj->ice_context(Ice::Context()), compObj->ice_context(ctx2)));
+    test(!Ice::targetEquals(compObj->ice_context(ctx1), compObj->ice_context(ctx2)));
+    test(Ice::targetLess(compObj->ice_context(ctx1), compObj->ice_context(ctx2)));
+    test(!Ice::targetLess(compObj->ice_context(ctx2), compObj->ice_context(ctx1)));
+
+    test(Ice::targetEquals(compObj->ice_preferSecure(true), compObj->ice_preferSecure(true)));
+    test(!Ice::targetEquals(compObj->ice_preferSecure(true), compObj->ice_preferSecure(false)));
+    test(Ice::targetLess(compObj->ice_preferSecure(false), compObj->ice_preferSecure(true)));
+    test(!Ice::targetLess(compObj->ice_preferSecure(true), compObj->ice_preferSecure(false)));
+
+    auto compObj1 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10000");
+    auto compObj2 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10001");
+    test(!Ice::targetEquals(compObj1, compObj2));
+    test(Ice::targetLess(compObj1, compObj2));
+    test(!Ice::targetLess(compObj2, compObj1));
+
+    compObj1 = communicator->stringToProxy("foo@MyAdapter1");
+    compObj2 = communicator->stringToProxy("foo@MyAdapter2");
+    test(!Ice::targetEquals(compObj1, compObj2));
+    test(Ice::targetLess(compObj1, compObj2));
+    test(!Ice::targetLess(compObj2, compObj1));
+
+    test(Ice::targetEquals(compObj1->ice_locatorCacheTimeout(20), compObj1->ice_locatorCacheTimeout(20)));
+    test(!Ice::targetEquals(compObj1->ice_locatorCacheTimeout(10), compObj1->ice_locatorCacheTimeout(20)));
+    test(Ice::targetLess(compObj1->ice_locatorCacheTimeout(10), compObj1->ice_locatorCacheTimeout(20)));
+    test(!Ice::targetLess(compObj1->ice_locatorCacheTimeout(20), compObj1->ice_locatorCacheTimeout(10)));
+
+    test(Ice::targetEquals(compObj1->ice_invocationTimeout(20), compObj1->ice_invocationTimeout(20)));
+    test(!Ice::targetEquals(compObj1->ice_invocationTimeout(10), compObj1->ice_invocationTimeout(20)));
+    test(Ice::targetLess(compObj1->ice_invocationTimeout(10), compObj1->ice_invocationTimeout(20)));
+    test(!Ice::targetLess(compObj1->ice_invocationTimeout(20), compObj1->ice_invocationTimeout(10)));
+
+    compObj1 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 1000");
+    compObj2 = communicator->stringToProxy("foo@MyAdapter1");
+    test(!Ice::targetEquals(compObj1, compObj2));
+    test(Ice::targetLess(compObj1, compObj2));
+    test(!Ice::targetLess(compObj2, compObj1));
+
+    Ice::EndpointSeq endpts1 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10000")->ice_getEndpoints();
+    Ice::EndpointSeq endpts2 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10001")->ice_getEndpoints();
+
+    auto eq = [](const shared_ptr<Ice::Endpoint>& lhs, const shared_ptr<Ice::Endpoint>& rhs)
+        {
+            return Ice::targetEquals(dynamic_pointer_cast<IceInternal::EndpointI>(lhs),
+                                     dynamic_pointer_cast<IceInternal::EndpointI>(rhs));
+        };
+
+    auto less = [](const shared_ptr<Ice::Endpoint>& lhs, const shared_ptr<Ice::Endpoint>& rhs)
+        {
+            return Ice::targetLess(dynamic_pointer_cast<IceInternal::EndpointI>(lhs),
+                                   dynamic_pointer_cast<IceInternal::EndpointI>(rhs));
+        };
+
+    test(!equal(endpts1.begin(), endpts1.end(), endpts2.begin(), endpts2.end(), eq));
+    test(lexicographical_compare(endpts1.begin(), endpts1.end(), endpts2.begin(), endpts2.end(), less));
+    test(!lexicographical_compare(endpts2.begin(), endpts2.end(), endpts1.begin(), endpts1.end(), less));
+
+    Ice::EndpointSeq endpts3 =  communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10000")->ice_getEndpoints();
+    test(equal(endpts1.begin(), endpts1.end(), endpts3.begin(), endpts3.end(), eq));
+
+    test(Ice::targetEquals(compObj1->ice_encodingVersion(Ice::Encoding_1_0), compObj1->ice_encodingVersion(Ice::Encoding_1_0)));
+    test(!Ice::targetEquals(compObj1->ice_encodingVersion(Ice::Encoding_1_0), compObj1->ice_encodingVersion(Ice::Encoding_1_1)));
+    test(Ice::targetLess(compObj->ice_encodingVersion(Ice::Encoding_1_0), compObj->ice_encodingVersion(Ice::Encoding_1_1)));
+    test(!Ice::targetLess(compObj->ice_encodingVersion(Ice::Encoding_1_1), compObj->ice_encodingVersion(Ice::Encoding_1_0)));
+
+    //
+    // TODO: Ideally we should also test comparison of fixed proxies.
+    //
+
+    cout << "ok" << endl;
+
+    cout << "testing checked cast... " << flush;
+    auto cl = Ice::checkedCast<Test::MyClassPrx>(base);
+    test(cl);
+
+    auto derived = Ice::checkedCast<Test::MyDerivedClassPrx>(cl);
+    test(derived);
+    test(Ice::targetEquals(cl, base));
+    test(Ice::targetEquals(derived, base));
+    test(Ice::targetEquals(cl, derived));
+
+    auto loc = Ice::checkedCast<Ice::LocatorPrx>(base);
+    test(loc == nullptr);
+
+    //
+    // Upcasting
+    //
+    auto cl2 = Ice::checkedCast<Test::MyClassPrx>(derived);
+    auto obj = Ice::checkedCast<Ice::ObjectPrx>(derived);
+    test(cl2);
+    test(obj);
+    test(Ice::targetEquals(cl2, obj));
+    test(Ice::targetEquals(cl2, derived));
+#else
     test(communicator->stringToProxy("foo") == communicator->stringToProxy("foo"));
     test(communicator->stringToProxy("foo") != communicator->stringToProxy("foo2"));
     test(communicator->stringToProxy("foo") < communicator->stringToProxy("foo2"));
     test(!(communicator->stringToProxy("foo2") < communicator->stringToProxy("foo")));
 
-    Ice::ObjectPrx compObj = communicator->stringToProxy("foo");
+    Ice::ObjectPrxPtr compObj = communicator->stringToProxy("foo");
 
     test(compObj->ice_facet("facet") == compObj->ice_facet("facet"));
     test(compObj->ice_facet("facet") != compObj->ice_facet("facet1"));
@@ -603,8 +787,8 @@ allTests(const Ice::CommunicatorPtr& communicator)
     test(compObj->ice_timeout(10) < compObj->ice_timeout(20));
     test(!(compObj->ice_timeout(20) < compObj->ice_timeout(10)));
 
-    Ice::LocatorPrx loc1 = Ice::LocatorPrx::uncheckedCast(communicator->stringToProxy("loc1:default -p 10000"));
-    Ice::LocatorPrx loc2 = Ice::LocatorPrx::uncheckedCast(communicator->stringToProxy("loc2:default -p 10000"));
+    Ice::LocatorPrxPtr loc1 = ICE_UNCHECKED_CAST(Ice::LocatorPrx, communicator->stringToProxy("loc1:default -p 10000"));
+    Ice::LocatorPrxPtr loc2 = ICE_UNCHECKED_CAST(Ice::LocatorPrx, communicator->stringToProxy("loc2:default -p 10000"));
     test(compObj->ice_locator(0) == compObj->ice_locator(0));
     test(compObj->ice_locator(loc1) == compObj->ice_locator(loc1));
     test(compObj->ice_locator(loc1) != compObj->ice_locator(0));
@@ -615,8 +799,8 @@ allTests(const Ice::CommunicatorPtr& communicator)
     test(compObj->ice_locator(loc1) < compObj->ice_locator(loc2));
     test(!(compObj->ice_locator(loc2) < compObj->ice_locator(loc1)));
 
-    Ice::RouterPrx rtr1 = Ice::RouterPrx::uncheckedCast(communicator->stringToProxy("rtr1:default -p 10000"));
-    Ice::RouterPrx rtr2 = Ice::RouterPrx::uncheckedCast(communicator->stringToProxy("rtr2:default -p 10000"));
+    Ice::RouterPrxPtr rtr1 = ICE_UNCHECKED_CAST(Ice::RouterPrx, communicator->stringToProxy("rtr1:default -p 10000"));
+    Ice::RouterPrxPtr rtr2 = ICE_UNCHECKED_CAST(Ice::RouterPrx, communicator->stringToProxy("rtr2:default -p 10000"));
     test(compObj->ice_router(0) == compObj->ice_router(0));
     test(compObj->ice_router(rtr1) == compObj->ice_router(rtr1));
     test(compObj->ice_router(rtr1) != compObj->ice_router(0));
@@ -644,8 +828,8 @@ allTests(const Ice::CommunicatorPtr& communicator)
     test(compObj->ice_preferSecure(false) < compObj->ice_preferSecure(true));
     test(!(compObj->ice_preferSecure(true) < compObj->ice_preferSecure(false)));
 
-    Ice::ObjectPrx compObj1 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10000");
-    Ice::ObjectPrx compObj2 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10001");
+    Ice::ObjectPrxPtr compObj1 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10000");
+    Ice::ObjectPrxPtr compObj2 = communicator->stringToProxy("foo:tcp -h 127.0.0.1 -p 10001");
     test(compObj1 != compObj2);
     test(compObj1 < compObj2);
     test(!(compObj2 < compObj1));
@@ -691,23 +875,23 @@ allTests(const Ice::CommunicatorPtr& communicator)
     cout << "ok" << endl;
 
     cout << "testing checked cast... " << flush;
-    Test::MyClassPrx cl = Test::MyClassPrx::checkedCast(base);
+    Test::MyClassPrxPtr cl = ICE_CHECKED_CAST(Test::MyClassPrx, base);
     test(cl);
 
-    Test::MyDerivedClassPrx derived = Test::MyDerivedClassPrx::checkedCast(cl);
+    Test::MyDerivedClassPrxPtr derived = ICE_CHECKED_CAST(Test::MyDerivedClassPrx, cl);
     test(derived);
     test(cl == base);
     test(derived == base);
     test(cl == derived);
 
-    Ice::LocatorPrx loc = Ice::LocatorPrx::checkedCast(base);
+    Ice::LocatorPrxPtr loc = ICE_CHECKED_CAST(Ice::LocatorPrx, base);
     test(loc == 0);
 
     //
     // Upcasting
     //
-    Test::MyClassPrx cl2 = Test::MyClassPrx::checkedCast(derived);
-    Ice::ObjectPrx obj = Ice::ObjectPrx::checkedCast(derived);
+    Test::MyClassPrxPtr cl2 = ICE_CHECKED_CAST(Test::MyClassPrx, derived);
+    Ice::ObjectPrxPtr obj = ICE_CHECKED_CAST(Ice::ObjectPrx, derived);
     test(cl2);
     test(obj);
     test(cl2 == obj);
@@ -733,7 +917,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     test(obj);
     test(cl2 == obj);
     test(cl2 == derived);
-
+#endif
     cout << "ok" << endl;
 
     cout << "testing checked cast with context... " << flush;
@@ -742,13 +926,18 @@ allTests(const Ice::CommunicatorPtr& communicator)
 
     c["one"] = "hello";
     c["two"] = "world";
+#ifdef ICE_CPP11_MAPPING
+    cl = Ice::checkedCast<Test::MyClassPrx>(base, c);
+#else
     cl = Test::MyClassPrx::checkedCast(base, c);
+#endif
     Ice::Context c2 = cl->getContext();
     test(c == c2);
 
     //
     // Now with alternate API
     //
+#ifndef ICE_CPP11_MAPPING
     cl = checkedCast<Test::MyClassPrx>(base);
     c = cl->getContext();
     test(c.size() == 0);
@@ -756,12 +945,12 @@ allTests(const Ice::CommunicatorPtr& communicator)
     cl = checkedCast<Test::MyClassPrx>(base, c);
     c2 = cl->getContext();
     test(c == c2);
-
+#endif
     cout << "ok" << endl;
 
     cout << "testing encoding versioning... " << flush;
     string ref20 = "test -e 2.0:default -p 12010";
-    Test::MyClassPrx cl20 = Test::MyClassPrx::uncheckedCast(communicator->stringToProxy(ref20));
+    Test::MyClassPrxPtr cl20 = ICE_UNCHECKED_CAST(Test::MyClassPrx, communicator->stringToProxy(ref20));
     try
     {
         cl20->ice_ping();
@@ -773,7 +962,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
 
     string ref10 = "test -e 1.0:default -p 12010";
-    Test::MyClassPrx cl10 = Test::MyClassPrx::uncheckedCast(communicator->stringToProxy(ref10));
+    Test::MyClassPrxPtr cl10 = ICE_UNCHECKED_CAST(Test::MyClassPrx, communicator->stringToProxy(ref10));
     cl10->ice_ping();
     cl10->ice_encodingVersion(Ice::Encoding_1_0)->ice_ping();
     cl->ice_encodingVersion(Ice::Encoding_1_0)->ice_ping();
@@ -781,10 +970,18 @@ allTests(const Ice::CommunicatorPtr& communicator)
     // 1.3 isn't supported but since a 1.3 proxy supports 1.1, the
     // call will use the 1.1 encoding
     string ref13 = "test -e 1.3:default -p 12010";
-    Test::MyClassPrx cl13 = Test::MyClassPrx::uncheckedCast(communicator->stringToProxy(ref13));
+    Test::MyClassPrxPtr cl13 = ICE_UNCHECKED_CAST(Test::MyClassPrx, communicator->stringToProxy(ref13));
     cl13->ice_ping();
+#ifdef ICE_CPP11_MAPPING
+    cl13->ice_ping_async().get();
+#else
     cl13->end_ice_ping(cl13->begin_ice_ping());
+#endif
 
+#ifndef ICE_CPP11_MAPPING
+    //
+    // TODO port this once the C++11 streaming API is done
+    //
     try
     {
         // Send request with bogus 1.2 encoding.
@@ -826,13 +1023,14 @@ allTests(const Ice::CommunicatorPtr& communicator)
         // The server thrown an UnsupportedEncodingException
         test(ex.unknown.find("UnsupportedEncodingException") != string::npos);
     }
+#endif
 
     cout << "ok" << endl;
 
     cout << "testing protocol versioning... " << flush;
 
     ref20 = "test -p 2.0:default -p 12010";
-    cl20 = Test::MyClassPrx::uncheckedCast(communicator->stringToProxy(ref20));
+    cl20 = ICE_UNCHECKED_CAST(Test::MyClassPrx, communicator->stringToProxy(ref20));
     try
     {
         cl20->ice_ping();
@@ -844,16 +1042,19 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
 
     ref10 = "test -p 1.0:default -p 12010";
-    cl10 = Test::MyClassPrx::uncheckedCast(communicator->stringToProxy(ref10));
+    cl10 = ICE_UNCHECKED_CAST(Test::MyClassPrx, communicator->stringToProxy(ref10));
     cl10->ice_ping();
 
     // 1.3 isn't supported but since a 1.3 proxy supports 1.0, the
     // call will use the 1.0 encoding
     ref13 = "test -p 1.3:default -p 12010";
-    cl13 = Test::MyClassPrx::uncheckedCast(communicator->stringToProxy(ref13));
+    cl13 = ICE_UNCHECKED_CAST(Test::MyClassPrx, communicator->stringToProxy(ref13));
     cl13->ice_ping();
+#ifdef ICE_CPP11_MAPPING
+    cl13->ice_ping_async().get();
+#else
     cl13->end_ice_ping(cl13->begin_ice_ping());
-
+#endif
     cout << "ok" <<endl;
 
     cout << "testing opaque endpoints... " << flush;
@@ -861,7 +1062,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     try
     {
         // Invalid -x option
-        Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -t 99 -v abc -x abc");
+        Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -t 99 -v abc -x abc");
         test(false);
     }
     catch(const Ice::EndpointParseException&)
@@ -871,7 +1072,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     try
     {
         // Missing -t and -v
-        Ice::ObjectPrx p = communicator->stringToProxy("id:opaque");
+        Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque");
         test(false);
     }
     catch(const Ice::EndpointParseException&)
@@ -881,7 +1082,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     try
     {
         // Repeated -t
-        Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -t 1 -t 1 -v abc");
+        Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -t 1 -t 1 -v abc");
         test(false);
     }
     catch(const Ice::EndpointParseException&)
@@ -891,7 +1092,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     try
     {
         // Repeated -v
-        Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -t 1 -v abc -v abc");
+        Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -t 1 -v abc -v abc");
         test(false);
     }
     catch(const Ice::EndpointParseException&)
@@ -901,7 +1102,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     try
     {
         // Missing -t
-        Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -v abc");
+        Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -v abc");
         test(false);
     }
     catch(const Ice::EndpointParseException&)
@@ -911,7 +1112,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     try
     {
         // Missing -v
-        Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -t 1");
+        Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -t 1");
         test(false);
     }
     catch(const Ice::EndpointParseException&)
@@ -921,7 +1122,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     try
     {
         // Missing arg for -t
-        Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -t -v abc");
+        Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -t -v abc");
         test(false);
     }
     catch(const Ice::EndpointParseException&)
@@ -931,7 +1132,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     try
     {
         // Missing arg for -v
-        Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -t 1 -v");
+        Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -t 1 -v");
         test(false);
     }
     catch(const Ice::EndpointParseException&)
@@ -941,7 +1142,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     try
     {
         // Not a number for -t
-        Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -t x -v abc");
+        Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -t x -v abc");
         test(false);
     }
     catch(const Ice::EndpointParseException&)
@@ -951,7 +1152,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     try
     {
         // < 0 for -t
-        Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -t -1 -v abc");
+        Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -t -1 -v abc");
         test(false);
     }
     catch(const Ice::EndpointParseException&)
@@ -961,7 +1162,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
     try
     {
         // Invalid char for -v
-        Ice::ObjectPrx p = communicator->stringToProxy("id:opaque -t 99 -v x?c");
+        Ice::ObjectPrxPtr p = communicator->stringToProxy("id:opaque -t 99 -v x?c");
         test(false);
     }
     catch(const Ice::EndpointParseException&)
@@ -969,12 +1170,12 @@ allTests(const Ice::CommunicatorPtr& communicator)
     }
 
     // Legal TCP endpoint expressed as opaque endpoint
-    Ice::ObjectPrx p1 = communicator->stringToProxy("test -e 1.1:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==");
+    Ice::ObjectPrxPtr p1 = communicator->stringToProxy("test -e 1.1:opaque -e 1.0 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==");
     string pstr = communicator->proxyToString(p1);
     test(pstr == "test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000");
 
     // Opaque endpoint encoded with 1.1 encoding.
-    Ice::ObjectPrx p2 = communicator->stringToProxy("test -e 1.1:opaque -e 1.1 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==");
+    Ice::ObjectPrxPtr p2 = communicator->stringToProxy("test -e 1.1:opaque -e 1.1 -t 1 -v CTEyNy4wLjAuMeouAAAQJwAAAA==");
     test(communicator->proxyToString(p2) == "test -t -e 1.1:tcp -h 127.0.0.1 -p 12010 -t 10000");
 
     if(communicator->getProperties()->getPropertyAsInt("Ice.IPv6") == 0 &&
@@ -1043,7 +1244,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         // sent over the wire and returned by the server without losing
         // the opaque endpoints.
         //
-        Ice::ObjectPrx p2 = derived->echo(p1);
+        Ice::ObjectPrxPtr p2 = derived->echo(p1);
         pstr = communicator->proxyToString(p2);
         if(ssl)
         {
diff --git a/cpp/test/Ice/proxy/Client.cpp b/cpp/test/Ice/proxy/Client.cpp
index 6eed51d0287..b436481d8ac 100644
--- a/cpp/test/Ice/proxy/Client.cpp
+++ b/cpp/test/Ice/proxy/Client.cpp
@@ -18,8 +18,8 @@ using namespace std;
 int
 run(int, char**, const Ice::CommunicatorPtr& communicator, const Ice::InitializationData&)
 {
-    Test::MyClassPrx allTests(const Ice::CommunicatorPtr&);
-    Test::MyClassPrx myClass = allTests(communicator);
+    Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr&);
+    Test::MyClassPrxPtr myClass = allTests(communicator);
 
     myClass->shutdown();
 
diff --git a/cpp/test/Ice/proxy/Collocated.cpp b/cpp/test/Ice/proxy/Collocated.cpp
index 6c008378319..3612987454d 100644
--- a/cpp/test/Ice/proxy/Collocated.cpp
+++ b/cpp/test/Ice/proxy/Collocated.cpp
@@ -21,10 +21,10 @@ run(int, char**, const Ice::CommunicatorPtr& communicator,
 {
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
+    adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test"));
     //adapter->activate(); // Don't activate OA to ensure collocation is used.
 
-    Test::MyClassPrx allTests(const Ice::CommunicatorPtr&);
+    Test::MyClassPrxPtr allTests(const Ice::CommunicatorPtr&);
     allTests(communicator);
 
     return EXIT_SUCCESS;
diff --git a/cpp/test/Ice/proxy/Makefile b/cpp/test/Ice/proxy/Makefile
index fd028031a2f..803fb4d002d 100644
--- a/cpp/test/Ice/proxy/Makefile
+++ b/cpp/test/Ice/proxy/Makefile
@@ -49,7 +49,7 @@ GENPIC          = no
 
 include $(top_srcdir)/config/Make.rules
 
-CPPFLAGS	:= -I. -I../../include $(CPPFLAGS)
+CPPFLAGS	:= -I. -I../../include -I../../../src $(CPPFLAGS)
 
 $(CLIENT): $(COBJS)
 	rm -f $@
diff --git a/cpp/test/Ice/proxy/Makefile.mak b/cpp/test/Ice/proxy/Makefile.mak
index c08163168a4..55b8cc66b0f 100644
--- a/cpp/test/Ice/proxy/Makefile.mak
+++ b/cpp/test/Ice/proxy/Makefile.mak
@@ -52,7 +52,7 @@ OBJS		= $(COBJS) \
 
 !include $(top_srcdir)/config/Make.rules.mak
 
-CPPFLAGS	= -I. -I../../include $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
+CPPFLAGS	= -I. -I../../include -I../../../src $(CPPFLAGS) -DWIN32_LEAN_AND_MEAN
 
 !if "$(GENERATE_PDB)" == "yes"
 CPDBFLAGS        = /pdb:$(CLIENT).pdb
diff --git a/cpp/test/Ice/proxy/Server.cpp b/cpp/test/Ice/proxy/Server.cpp
index 10195276471..f9b26da3b59 100644
--- a/cpp/test/Ice/proxy/Server.cpp
+++ b/cpp/test/Ice/proxy/Server.cpp
@@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
+    adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test"));
     adapter->activate();
     TEST_READY
     communicator->waitForShutdown();
diff --git a/cpp/test/Ice/proxy/ServerAMD.cpp b/cpp/test/Ice/proxy/ServerAMD.cpp
index f0f85af4b9f..a27b9df15ac 100644
--- a/cpp/test/Ice/proxy/ServerAMD.cpp
+++ b/cpp/test/Ice/proxy/ServerAMD.cpp
@@ -20,7 +20,7 @@ run(int, char**, const Ice::CommunicatorPtr& communicator)
 {
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    adapter->add(new MyDerivedClassI, communicator->stringToIdentity("test"));
+    adapter->add(ICE_MAKE_SHARED(MyDerivedClassI), communicator->stringToIdentity("test"));
     adapter->activate();
     TEST_READY
     communicator->waitForShutdown();
diff --git a/cpp/test/Ice/proxy/TestAMDI.cpp b/cpp/test/Ice/proxy/TestAMDI.cpp
index 401f276292c..54098ebd7ae 100644
--- a/cpp/test/Ice/proxy/TestAMDI.cpp
+++ b/cpp/test/Ice/proxy/TestAMDI.cpp
@@ -11,10 +11,42 @@
 #include <TestAMDI.h>
 #include <TestCommon.h>
 
+using namespace std;
+
 MyDerivedClassI::MyDerivedClassI()
 {
 }
 
+#ifdef ICE_CPP11_MAPPING
+void
+MyDerivedClassI::echo_async(
+    const shared_ptr<Ice::ObjectPrx>& obj,
+    function<void (const shared_ptr<Ice::ObjectPrx>&)> response,
+    function<void (const exception_ptr&)>,
+    const Ice::Current&)
+{
+    response(obj);
+}
+
+void
+MyDerivedClassI::shutdown_async(
+    function<void ()> response,
+    function<void (const exception_ptr&)>,
+    const Ice::Current& current)
+{
+    current.adapter->getCommunicator()->shutdown();
+    response();
+}
+
+void
+MyDerivedClassI::getContext_async(
+    function<void (const Ice::Context&)> response,
+    function<void (const exception_ptr&)>,
+    const Ice::Current&)
+{
+    response(_ctx);
+}
+#else
 void
 MyDerivedClassI::echo_async(const Test::AMD_MyDerivedClass_echoPtr& cb, const Ice::ObjectPrx& obj, const Ice::Current&)
 {
@@ -33,10 +65,14 @@ MyDerivedClassI::getContext_async(const Test::AMD_MyClass_getContextPtr& cb, con
 {
     cb->ice_response(_ctx);
 }
-
+#endif
 bool
-MyDerivedClassI::ice_isA(const std::string& s, const Ice::Current& current) const
+MyDerivedClassI::ice_isA(const string& s, const Ice::Current& current) const
 {
     _ctx = current.ctx;
+#ifdef ICE_CPP11_MAPPING
+    return Test::MyDerivedClassDisp::ice_isA(s, current);
+#else
     return Test::MyDerivedClass::ice_isA(s, current);
+#endif
 }
diff --git a/cpp/test/Ice/proxy/TestAMDI.h b/cpp/test/Ice/proxy/TestAMDI.h
index b25a0b1dd29..b3400f4f83d 100644
--- a/cpp/test/Ice/proxy/TestAMDI.h
+++ b/cpp/test/Ice/proxy/TestAMDI.h
@@ -12,19 +12,41 @@
 
 #include <TestAMD.h>
 
-class MyDerivedClassI : public Test::MyDerivedClass
+class MyDerivedClassI : 
+#ifdef ICE_CPP11_MAPPING
+    public Test::MyDerivedClassDisp
+#else
+    public Test::MyDerivedClass
+#endif
 {
 public:
 
     MyDerivedClassI();
     
+#ifdef ICE_CPP11_MAPPING
+    virtual void echo_async(
+        const std::shared_ptr<Ice::ObjectPrx>&,
+        ::std::function<void (const ::std::shared_ptr<Ice::ObjectPrx>&)>,
+        ::std::function<void (const ::std::exception_ptr&)>,
+        const Ice::Current&);
+    
+    virtual void shutdown_async(
+        ::std::function<void ()>,
+        ::std::function<void (const ::std::exception_ptr&)>,
+        const Ice::Current&);
+
+    virtual void getContext_async(
+        ::std::function<void (const Ice::Context&)>,
+        ::std::function<void (const ::std::exception_ptr&)>,
+        const Ice::Current&);
+#else
     virtual void echo_async(const Test::AMD_MyDerivedClass_echoPtr&, const Ice::ObjectPrx&, const Ice::Current&);
     virtual void shutdown_async(const Test::AMD_MyClass_shutdownPtr&,
                                 const Ice::Current&);
     virtual void getContext_async(const Test::AMD_MyClass_getContextPtr& cb,
                                   const Ice::Current&);
+#endif
     virtual bool ice_isA(const std::string&, const Ice::Current&) const;
-
 private:
 
     mutable Ice::Context _ctx;
diff --git a/cpp/test/Ice/proxy/TestI.cpp b/cpp/test/Ice/proxy/TestI.cpp
index e8412bbac8c..7ffde953fad 100644
--- a/cpp/test/Ice/proxy/TestI.cpp
+++ b/cpp/test/Ice/proxy/TestI.cpp
@@ -17,8 +17,8 @@ MyDerivedClassI::MyDerivedClassI()
 {
 }
 
-Ice::ObjectPrx
-MyDerivedClassI::echo(const Ice::ObjectPrx& obj, const Ice::Current&)
+Ice::ObjectPrxPtr
+MyDerivedClassI::echo(const Ice::ObjectPrxPtr& obj, const Ice::Current&)
 {
     return obj;
 }
@@ -39,5 +39,9 @@ bool
 MyDerivedClassI::ice_isA(const std::string& s, const Ice::Current& current) const
 {
     _ctx = current.ctx;
+#ifdef ICE_CPP11_MAPPING
+    return Test::MyDerivedClassDisp::ice_isA(s, current);
+#else
     return Test::MyDerivedClass::ice_isA(s, current);
+#endif
 }
diff --git a/cpp/test/Ice/proxy/TestI.h b/cpp/test/Ice/proxy/TestI.h
index 9aaea330ef0..f032507e3d8 100644
--- a/cpp/test/Ice/proxy/TestI.h
+++ b/cpp/test/Ice/proxy/TestI.h
@@ -12,13 +12,18 @@
 
 #include <Test.h>
 
-class MyDerivedClassI : public Test::MyDerivedClass
+class MyDerivedClassI : 
+#ifdef ICE_CPP11_MAPPING
+    public Test::MyDerivedClassDisp
+#else
+    public Test::MyDerivedClass
+#endif
 {
 public:
 
     MyDerivedClassI();
 
-    virtual Ice::ObjectPrx echo(const Ice::ObjectPrx&, const Ice::Current&);
+    virtual Ice::ObjectPrxPtr echo(const Ice::ObjectPrxPtr&, const Ice::Current&);
     virtual void shutdown(const Ice::Current&);
     virtual Ice::Context getContext(const Ice::Current&);
     virtual bool ice_isA(const std::string&, const Ice::Current&) const;
diff --git a/cpp/test/Ice/retry/.depend.mak b/cpp/test/Ice/retry/.depend.mak
index dc709470a7f..adb5a97e8da 100755
--- a/cpp/test/Ice/retry/.depend.mak
+++ b/cpp/test/Ice/retry/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -225,6 +228,7 @@ InstrumentationI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -233,6 +237,7 @@ InstrumentationI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -273,7 +278,7 @@ InstrumentationI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -287,6 +292,7 @@ InstrumentationI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -298,7 +304,6 @@ InstrumentationI.obj: \
     "$(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" \
@@ -321,7 +326,6 @@ InstrumentationI.obj: \
     "$(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" \
@@ -352,6 +356,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -360,6 +365,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -400,7 +406,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -414,6 +420,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -425,7 +432,6 @@ AllTests.obj: \
     "$(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" \
@@ -448,7 +454,6 @@ AllTests.obj: \
     "$(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" \
@@ -482,6 +487,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -490,6 +496,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -530,7 +537,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -544,6 +551,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -555,7 +563,6 @@ TestI.obj: \
     "$(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" \
@@ -578,7 +585,6 @@ TestI.obj: \
     "$(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" \
@@ -607,6 +613,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -615,6 +622,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -655,7 +663,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -669,6 +677,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -680,7 +689,6 @@ Server.obj: \
     "$(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" \
@@ -703,7 +711,6 @@ Server.obj: \
     "$(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" \
@@ -736,6 +743,7 @@ Collocated.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -744,6 +752,7 @@ Collocated.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -784,7 +793,7 @@ Collocated.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -798,6 +807,7 @@ Collocated.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -809,7 +819,6 @@ Collocated.obj: \
     "$(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" \
@@ -832,7 +841,6 @@ Collocated.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/servantLocator/.depend.mak b/cpp/test/Ice/servantLocator/.depend.mak
index 6fa2f15c7e6..c12e76ab764 100755
--- a/cpp/test/Ice/servantLocator/.depend.mak
+++ b/cpp/test/Ice/servantLocator/.depend.mak
@@ -19,6 +19,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -27,6 +28,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -61,7 +63,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -70,13 +72,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -102,6 +104,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -110,6 +113,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -150,7 +154,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -164,6 +168,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -175,7 +180,6 @@ Client.obj: \
     "$(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" \
@@ -197,7 +201,6 @@ Client.obj: \
     "$(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" \
@@ -229,6 +232,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -237,6 +241,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -277,7 +282,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -291,6 +296,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -302,7 +308,6 @@ AllTests.obj: \
     "$(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" \
@@ -325,7 +330,6 @@ AllTests.obj: \
     "$(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" \
@@ -376,6 +380,7 @@ TestI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -383,6 +388,7 @@ TestI.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -411,7 +417,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -424,6 +430,7 @@ TestI.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -435,7 +442,6 @@ TestI.obj: \
     "$(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" \
@@ -457,7 +463,6 @@ TestI.obj: \
     "$(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" \
@@ -486,6 +491,7 @@ ServantLocatorI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -494,6 +500,7 @@ ServantLocatorI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -534,7 +541,7 @@ ServantLocatorI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -548,6 +555,7 @@ ServantLocatorI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -559,7 +567,6 @@ ServantLocatorI.obj: \
     "$(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" \
@@ -582,7 +589,6 @@ ServantLocatorI.obj: \
     "$(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" \
@@ -615,6 +621,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -623,6 +630,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -663,7 +671,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -677,6 +685,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -688,7 +697,6 @@ Server.obj: \
     "$(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" \
@@ -710,7 +718,6 @@ Server.obj: \
     "$(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" \
@@ -742,6 +749,7 @@ TestAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -750,6 +758,7 @@ TestAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -784,7 +793,7 @@ TestAMD.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -793,6 +802,7 @@ TestAMD.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -800,7 +810,6 @@ TestAMD.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -844,6 +853,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -851,6 +861,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -879,7 +890,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -892,6 +903,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -903,7 +915,6 @@ TestAMDI.obj: \
     "$(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" \
@@ -925,7 +936,6 @@ TestAMDI.obj: \
     "$(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" \
@@ -954,6 +964,7 @@ ServerAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -962,6 +973,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1002,7 +1014,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1016,6 +1028,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1027,7 +1040,6 @@ ServerAMD.obj: \
     "$(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" \
@@ -1049,7 +1061,6 @@ ServerAMD.obj: \
     "$(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" \
@@ -1084,6 +1095,7 @@ Collocated.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1092,6 +1104,7 @@ Collocated.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1132,7 +1145,7 @@ Collocated.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1146,6 +1159,7 @@ Collocated.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1157,7 +1171,6 @@ Collocated.obj: \
     "$(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" \
@@ -1179,7 +1192,6 @@ Collocated.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/services/.depend.mak b/cpp/test/Ice/services/.depend.mak
index a730edad423..d3ae3494aa7 100755
--- a/cpp/test/Ice/services/.depend.mak
+++ b/cpp/test/Ice/services/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -224,6 +227,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -232,6 +236,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -272,7 +277,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -286,6 +291,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -297,7 +303,6 @@ AllTests.obj: \
     "$(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" \
@@ -320,7 +325,6 @@ AllTests.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/slicing/exceptions/.depend.mak b/cpp/test/Ice/slicing/exceptions/.depend.mak
index 6147ee954dc..9abe3d1215d 100755
--- a/cpp/test/Ice/slicing/exceptions/.depend.mak
+++ b/cpp/test/Ice/slicing/exceptions/.depend.mak
@@ -31,6 +31,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -39,6 +40,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -73,7 +75,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -82,13 +84,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -114,6 +116,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -122,6 +125,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -162,7 +166,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -176,6 +180,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -187,7 +192,6 @@ Client.obj: \
     "$(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" \
@@ -210,7 +214,6 @@ Client.obj: \
     "$(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" \
@@ -240,6 +243,7 @@ ClientPrivate.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -248,6 +252,7 @@ ClientPrivate.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -282,7 +287,7 @@ ClientPrivate.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -291,13 +296,13 @@ ClientPrivate.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.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" \
     "Test.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
@@ -324,6 +329,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -332,6 +338,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -372,7 +379,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -386,6 +393,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -397,7 +405,6 @@ AllTests.obj: \
     "$(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" \
@@ -420,7 +427,6 @@ AllTests.obj: \
     "$(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" \
@@ -451,6 +457,7 @@ ServerPrivate.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -459,6 +466,7 @@ ServerPrivate.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -493,7 +501,7 @@ ServerPrivate.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -502,13 +510,13 @@ ServerPrivate.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.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" \
     "Test.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
@@ -534,6 +542,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -542,6 +551,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -576,7 +586,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -585,13 +595,13 @@ TestI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.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" \
     "Test.h" \
     "$(includedir)\Ice\Ice.h" \
     "$(includedir)\Ice\DeprecatedStringConverter.h" \
@@ -634,7 +644,6 @@ TestI.obj: \
     "$(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" \
@@ -665,6 +674,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -673,6 +683,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -713,7 +724,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -727,6 +738,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -738,7 +750,6 @@ Server.obj: \
     "$(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" \
@@ -761,7 +772,6 @@ Server.obj: \
     "$(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" \
@@ -793,6 +803,7 @@ TestAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -801,6 +812,7 @@ TestAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -835,7 +847,7 @@ TestAMD.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -844,6 +856,7 @@ TestAMD.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -851,7 +864,6 @@ TestAMD.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -875,6 +887,7 @@ ServerPrivateAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -883,6 +896,7 @@ ServerPrivateAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -917,7 +931,7 @@ ServerPrivateAMD.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -926,6 +940,7 @@ ServerPrivateAMD.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -933,7 +948,6 @@ ServerPrivateAMD.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "TestAMD.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
@@ -959,6 +973,7 @@ TestAMDI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -967,6 +982,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1001,7 +1017,7 @@ TestAMDI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1010,6 +1026,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1017,7 +1034,6 @@ TestAMDI.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "TestAMD.h" \
     "$(includedir)\Ice\Ice.h" \
     "$(includedir)\Ice\DeprecatedStringConverter.h" \
@@ -1059,7 +1075,6 @@ TestAMDI.obj: \
     "$(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" \
@@ -1090,6 +1105,7 @@ ServerAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1098,6 +1114,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1138,7 +1155,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1152,6 +1169,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1163,7 +1181,6 @@ ServerAMD.obj: \
     "$(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" \
@@ -1186,7 +1203,6 @@ ServerAMD.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/slicing/objects/.depend.mak b/cpp/test/Ice/slicing/objects/.depend.mak
index aa4ed1ef281..6fac2ce0ead 100755
--- a/cpp/test/Ice/slicing/objects/.depend.mak
+++ b/cpp/test/Ice/slicing/objects/.depend.mak
@@ -34,6 +34,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -42,6 +43,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -76,7 +78,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -85,6 +87,7 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -92,7 +95,6 @@ Test.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -116,6 +118,7 @@ ClientPrivate.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -124,6 +127,7 @@ ClientPrivate.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -158,7 +162,7 @@ ClientPrivate.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -167,6 +171,7 @@ ClientPrivate.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -174,7 +179,6 @@ ClientPrivate.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "Test.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
@@ -201,6 +205,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -209,6 +214,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -249,7 +255,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -263,6 +269,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -274,7 +281,6 @@ Client.obj: \
     "$(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" \
@@ -297,7 +303,6 @@ Client.obj: \
     "$(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" \
@@ -330,6 +335,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -338,6 +344,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -378,7 +385,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -392,6 +399,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -403,7 +411,6 @@ AllTests.obj: \
     "$(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" \
@@ -426,7 +433,6 @@ AllTests.obj: \
     "$(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" \
@@ -457,6 +463,7 @@ Forward.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -465,6 +472,7 @@ Forward.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -499,7 +507,7 @@ Forward.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -508,13 +516,13 @@ Forward.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -537,6 +545,7 @@ ServerPrivate.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -545,6 +554,7 @@ ServerPrivate.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -579,7 +589,7 @@ ServerPrivate.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -588,6 +598,7 @@ ServerPrivate.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -595,7 +606,6 @@ ServerPrivate.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "Test.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
@@ -621,6 +631,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -629,6 +640,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -663,7 +675,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -672,6 +684,7 @@ TestI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -679,7 +692,6 @@ TestI.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "Test.h" \
     "Forward.h" \
     "$(includedir)\Ice\Ice.h" \
@@ -722,7 +734,6 @@ TestI.obj: \
     "$(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" \
@@ -753,6 +764,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -761,6 +773,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -801,7 +814,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -815,6 +828,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -826,7 +840,6 @@ Server.obj: \
     "$(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" \
@@ -849,7 +862,6 @@ Server.obj: \
     "$(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" \
@@ -882,6 +894,7 @@ TestAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -890,6 +903,7 @@ TestAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -924,7 +938,7 @@ TestAMD.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -933,6 +947,7 @@ TestAMD.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -940,7 +955,6 @@ TestAMD.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -964,6 +978,7 @@ ServerPrivateAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -972,6 +987,7 @@ ServerPrivateAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1006,7 +1022,7 @@ ServerPrivateAMD.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1015,6 +1031,7 @@ ServerPrivateAMD.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1022,7 +1039,6 @@ ServerPrivateAMD.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "TestAMD.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
@@ -1048,6 +1064,7 @@ TestAMDI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1056,6 +1073,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -1090,7 +1108,7 @@ TestAMDI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1099,6 +1117,7 @@ TestAMDI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1106,7 +1125,6 @@ TestAMDI.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "TestAMD.h" \
     "Forward.h" \
     "$(includedir)\Ice\Ice.h" \
@@ -1149,7 +1167,6 @@ TestAMDI.obj: \
     "$(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" \
@@ -1180,6 +1197,7 @@ ServerAMD.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -1188,6 +1206,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -1228,7 +1247,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -1242,6 +1261,7 @@ ServerAMD.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -1253,7 +1273,6 @@ ServerAMD.obj: \
     "$(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" \
@@ -1276,7 +1295,6 @@ ServerAMD.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/stream/.depend.mak b/cpp/test/Ice/stream/.depend.mak
index c6421b8e608..96709144f71 100755
--- a/cpp/test/Ice/stream/.depend.mak
+++ b/cpp/test/Ice/stream/.depend.mak
@@ -17,6 +17,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -25,6 +26,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -59,7 +61,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -68,13 +70,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -100,6 +102,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -108,6 +111,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -148,7 +152,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -162,6 +166,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -173,7 +178,6 @@ Client.obj: \
     "$(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" \
@@ -196,7 +200,6 @@ Client.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/stringConverter/.depend.mak b/cpp/test/Ice/stringConverter/.depend.mak
index c2fb276f381..14fb5c6f44f 100755
--- a/cpp/test/Ice/stringConverter/.depend.mak
+++ b/cpp/test/Ice/stringConverter/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -98,6 +100,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -106,6 +109,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -146,7 +150,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -160,6 +164,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -171,7 +176,6 @@ Client.obj: \
     "$(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" \
@@ -194,7 +198,6 @@ Client.obj: \
     "$(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" \
@@ -226,6 +229,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -234,6 +238,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -274,7 +279,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -288,6 +293,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -299,7 +305,6 @@ Server.obj: \
     "$(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" \
@@ -322,7 +327,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/threadPoolPriority/.depend.mak b/cpp/test/Ice/threadPoolPriority/.depend.mak
index b9d72e1a44f..ffbfce8d58f 100755
--- a/cpp/test/Ice/threadPoolPriority/.depend.mak
+++ b/cpp/test/Ice/threadPoolPriority/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -224,6 +227,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -232,6 +236,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -272,7 +277,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -286,6 +291,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -297,7 +303,6 @@ AllTests.obj: \
     "$(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" \
@@ -320,7 +325,6 @@ AllTests.obj: \
     "$(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" \
@@ -352,6 +356,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -360,6 +365,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -400,7 +406,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -414,6 +420,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -425,7 +432,6 @@ TestI.obj: \
     "$(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" \
@@ -448,7 +454,6 @@ TestI.obj: \
     "$(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" \
@@ -476,6 +481,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -484,6 +490,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -524,7 +531,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -538,6 +545,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -549,7 +557,6 @@ Server.obj: \
     "$(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" \
@@ -572,7 +579,6 @@ Server.obj: \
     "$(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" \
@@ -605,6 +611,7 @@ ServerCustomThreadPool.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -613,6 +620,7 @@ ServerCustomThreadPool.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -653,7 +661,7 @@ ServerCustomThreadPool.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -667,6 +675,7 @@ ServerCustomThreadPool.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -678,7 +687,6 @@ ServerCustomThreadPool.obj: \
     "$(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" \
@@ -701,7 +709,6 @@ ServerCustomThreadPool.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/timeout/.depend.mak b/cpp/test/Ice/timeout/.depend.mak
index 92d9520a9a2..df7c1716b35 100755
--- a/cpp/test/Ice/timeout/.depend.mak
+++ b/cpp/test/Ice/timeout/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -95,6 +97,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -103,6 +106,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -137,7 +141,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -146,6 +150,7 @@ TestI.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -171,7 +176,6 @@ TestI.obj: \
     "$(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" \
@@ -194,7 +198,6 @@ TestI.obj: \
     "$(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" \
@@ -220,6 +223,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -228,6 +232,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -268,7 +273,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -282,6 +287,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -293,7 +299,6 @@ Client.obj: \
     "$(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" \
@@ -316,7 +321,6 @@ Client.obj: \
     "$(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" \
@@ -348,6 +352,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -356,6 +361,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -396,7 +402,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -410,6 +416,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -421,7 +428,6 @@ AllTests.obj: \
     "$(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" \
@@ -444,7 +450,6 @@ AllTests.obj: \
     "$(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" \
@@ -477,6 +482,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -485,6 +491,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -525,7 +532,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -539,6 +546,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -550,7 +558,6 @@ Server.obj: \
     "$(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" \
@@ -573,7 +580,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/Ice/udp/.depend.mak b/cpp/test/Ice/udp/.depend.mak
index 8f46119d3e3..014f4090a05 100755
--- a/cpp/test/Ice/udp/.depend.mak
+++ b/cpp/test/Ice/udp/.depend.mak
@@ -17,6 +17,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -25,6 +26,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -59,7 +61,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -68,13 +70,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -97,6 +99,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -105,6 +108,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -145,7 +149,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -159,6 +163,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -170,7 +175,6 @@ Client.obj: \
     "$(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" \
@@ -193,7 +197,6 @@ Client.obj: \
     "$(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" \
@@ -225,6 +228,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -233,6 +237,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -273,7 +278,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -287,6 +292,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -298,7 +304,6 @@ AllTests.obj: \
     "$(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" \
@@ -321,7 +326,6 @@ AllTests.obj: \
     "$(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" \
@@ -372,6 +376,7 @@ TestI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -379,6 +384,7 @@ TestI.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -407,7 +413,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -420,6 +426,7 @@ TestI.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -431,7 +438,6 @@ TestI.obj: \
     "$(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" \
@@ -453,7 +459,6 @@ TestI.obj: \
     "$(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" \
@@ -481,6 +486,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -489,6 +495,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -529,7 +536,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -543,6 +550,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -554,7 +562,6 @@ Server.obj: \
     "$(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" \
@@ -577,7 +584,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/IceBox/admin/.depend.mak b/cpp/test/IceBox/admin/.depend.mak
index 79c202fc823..9dd22223f74 100755
--- a/cpp/test/IceBox/admin/.depend.mak
+++ b/cpp/test/IceBox/admin/.depend.mak
@@ -19,6 +19,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -27,6 +28,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -61,7 +63,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -70,6 +72,7 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -79,7 +82,6 @@ Test.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -102,6 +104,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -110,6 +113,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -150,7 +154,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -164,6 +168,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -175,7 +180,6 @@ Client.obj: \
     "$(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" \
@@ -198,7 +202,6 @@ Client.obj: \
     "$(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" \
@@ -230,6 +233,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -238,6 +242,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -278,7 +283,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -292,6 +297,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -303,7 +309,6 @@ AllTests.obj: \
     "$(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" \
@@ -326,7 +331,6 @@ AllTests.obj: \
     "$(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" \
@@ -358,6 +362,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -366,6 +371,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -406,7 +412,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -420,6 +426,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -431,7 +438,6 @@ TestI.obj: \
     "$(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" \
@@ -454,7 +460,6 @@ TestI.obj: \
     "$(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" \
@@ -482,6 +487,7 @@ Service.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -490,6 +496,7 @@ Service.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -530,7 +537,7 @@ Service.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -544,6 +551,7 @@ Service.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -555,7 +563,6 @@ Service.obj: \
     "$(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" \
@@ -578,7 +585,6 @@ Service.obj: \
     "$(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" \
diff --git a/cpp/test/IceBox/configuration/.depend.mak b/cpp/test/IceBox/configuration/.depend.mak
index 34f47b79af2..fe2953e966b 100755
--- a/cpp/test/IceBox/configuration/.depend.mak
+++ b/cpp/test/IceBox/configuration/.depend.mak
@@ -17,6 +17,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -25,6 +26,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -59,7 +61,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -68,13 +70,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\LocalException.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -97,6 +99,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -105,6 +108,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -145,7 +149,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -159,6 +163,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -170,7 +175,6 @@ Client.obj: \
     "$(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" \
@@ -193,7 +197,6 @@ Client.obj: \
     "$(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" \
@@ -225,6 +228,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -233,6 +237,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -273,7 +278,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -287,6 +292,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -298,7 +304,6 @@ AllTests.obj: \
     "$(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" \
@@ -321,7 +326,6 @@ AllTests.obj: \
     "$(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" \
@@ -353,6 +357,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -361,6 +366,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -401,7 +407,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -415,6 +421,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -426,7 +433,6 @@ TestI.obj: \
     "$(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" \
@@ -449,7 +455,6 @@ TestI.obj: \
     "$(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" \
@@ -477,6 +482,7 @@ Service.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -485,6 +491,7 @@ Service.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -525,7 +532,7 @@ Service.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -539,6 +546,7 @@ Service.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -550,7 +558,6 @@ Service.obj: \
     "$(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" \
@@ -573,7 +580,6 @@ Service.obj: \
     "$(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" \
diff --git a/cpp/test/IceDiscovery/simple/.depend.mak b/cpp/test/IceDiscovery/simple/.depend.mak
index 80524069778..fc201e5e491 100755
--- a/cpp/test/IceDiscovery/simple/.depend.mak
+++ b/cpp/test/IceDiscovery/simple/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -224,6 +227,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -232,6 +236,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -272,7 +277,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -286,6 +291,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -297,7 +303,6 @@ AllTests.obj: \
     "$(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" \
@@ -320,7 +325,6 @@ AllTests.obj: \
     "$(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" \
@@ -371,6 +375,7 @@ TestI.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -378,6 +383,7 @@ TestI.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -406,7 +412,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -419,6 +425,7 @@ TestI.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -430,7 +437,6 @@ TestI.obj: \
     "$(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" \
@@ -452,7 +458,6 @@ TestI.obj: \
     "$(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" \
@@ -480,6 +485,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -488,6 +494,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -528,7 +535,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -542,6 +549,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -553,7 +561,6 @@ Server.obj: \
     "$(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" \
@@ -576,7 +583,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/IceGrid/activation/.depend.mak b/cpp/test/IceGrid/activation/.depend.mak
index c25c47f7c1a..0a8e26ec134 100755
--- a/cpp/test/IceGrid/activation/.depend.mak
+++ b/cpp/test/IceGrid/activation/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -224,6 +227,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -232,6 +236,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -272,7 +277,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -286,6 +291,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -297,7 +303,6 @@ AllTests.obj: \
     "$(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" \
@@ -320,7 +325,6 @@ AllTests.obj: \
     "$(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" \
@@ -368,6 +372,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -376,6 +381,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -416,7 +422,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -430,6 +436,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -441,7 +448,6 @@ TestI.obj: \
     "$(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" \
@@ -464,7 +470,6 @@ TestI.obj: \
     "$(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" \
@@ -492,6 +497,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -500,6 +506,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -540,7 +547,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -554,6 +561,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -565,7 +573,6 @@ Server.obj: \
     "$(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" \
@@ -588,7 +595,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/IceGrid/admin/.depend.mak b/cpp/test/IceGrid/admin/.depend.mak
index 2daf0a33181..441e01cda0c 100755
--- a/cpp/test/IceGrid/admin/.depend.mak
+++ b/cpp/test/IceGrid/admin/.depend.mak
@@ -15,6 +15,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -23,6 +24,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -63,7 +65,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -77,6 +79,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -88,7 +91,6 @@ Server.obj: \
     "$(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" \
@@ -111,7 +113,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/IceGrid/allocation/.depend.mak b/cpp/test/IceGrid/allocation/.depend.mak
index 4275667d41a..395461c6468 100755
--- a/cpp/test/IceGrid/allocation/.depend.mak
+++ b/cpp/test/IceGrid/allocation/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -231,6 +234,7 @@ AllTests.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -239,6 +243,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -273,7 +278,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -287,6 +292,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -298,7 +304,6 @@ AllTests.obj: \
     "$(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" \
@@ -321,7 +326,6 @@ AllTests.obj: \
     "$(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" \
@@ -371,6 +375,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -379,6 +384,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -419,7 +425,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -433,6 +439,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -444,7 +451,6 @@ TestI.obj: \
     "$(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" \
@@ -467,7 +473,6 @@ TestI.obj: \
     "$(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" \
@@ -495,6 +500,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -503,6 +509,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -543,7 +550,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -557,6 +564,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -568,7 +576,6 @@ Server.obj: \
     "$(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" \
@@ -591,7 +598,6 @@ Server.obj: \
     "$(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" \
@@ -624,6 +630,7 @@ PermissionsVerifier.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -632,6 +639,7 @@ PermissionsVerifier.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -672,7 +680,7 @@ PermissionsVerifier.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -686,6 +694,7 @@ PermissionsVerifier.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -697,7 +706,6 @@ PermissionsVerifier.obj: \
     "$(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" \
@@ -720,7 +728,6 @@ PermissionsVerifier.obj: \
     "$(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" \
diff --git a/cpp/test/IceGrid/deployer/.depend.mak b/cpp/test/IceGrid/deployer/.depend.mak
index 89051ba24d9..76ce806d5ff 100755
--- a/cpp/test/IceGrid/deployer/.depend.mak
+++ b/cpp/test/IceGrid/deployer/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -224,6 +227,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -232,6 +236,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -272,7 +277,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -286,6 +291,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -297,7 +303,6 @@ AllTests.obj: \
     "$(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" \
@@ -320,7 +325,6 @@ AllTests.obj: \
     "$(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" \
@@ -368,6 +372,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -376,6 +381,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -416,7 +422,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -430,6 +436,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -441,7 +448,6 @@ TestI.obj: \
     "$(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" \
@@ -464,7 +470,6 @@ TestI.obj: \
     "$(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" \
@@ -493,6 +498,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -501,6 +507,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -541,7 +548,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -555,6 +562,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -566,7 +574,6 @@ Server.obj: \
     "$(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" \
@@ -589,7 +596,6 @@ Server.obj: \
     "$(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" \
@@ -622,6 +628,7 @@ Service.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -630,6 +637,7 @@ Service.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -670,7 +678,7 @@ Service.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -684,6 +692,7 @@ Service.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -695,7 +704,6 @@ Service.obj: \
     "$(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" \
@@ -718,7 +726,6 @@ Service.obj: \
     "$(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" \
diff --git a/cpp/test/IceGrid/distribution/.depend.mak b/cpp/test/IceGrid/distribution/.depend.mak
index 2211a51b3f7..2fc87e56322 100755
--- a/cpp/test/IceGrid/distribution/.depend.mak
+++ b/cpp/test/IceGrid/distribution/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -230,6 +233,7 @@ AllTests.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -238,6 +242,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -272,7 +277,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -286,6 +291,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -297,7 +303,6 @@ AllTests.obj: \
     "$(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" \
@@ -320,7 +325,6 @@ AllTests.obj: \
     "$(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" \
@@ -368,6 +372,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -376,6 +381,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -416,7 +422,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -430,6 +436,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -441,7 +448,6 @@ TestI.obj: \
     "$(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" \
@@ -464,7 +470,6 @@ TestI.obj: \
     "$(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" \
@@ -492,6 +497,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -500,6 +506,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -540,7 +547,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -554,6 +561,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -565,7 +573,6 @@ Server.obj: \
     "$(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" \
@@ -588,7 +595,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/IceGrid/noRestartUpdate/.depend.mak b/cpp/test/IceGrid/noRestartUpdate/.depend.mak
index 99e8541d697..d99a3a60369 100755
--- a/cpp/test/IceGrid/noRestartUpdate/.depend.mak
+++ b/cpp/test/IceGrid/noRestartUpdate/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -230,6 +233,7 @@ AllTests.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -238,6 +242,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -272,7 +277,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -286,6 +291,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -297,7 +303,6 @@ AllTests.obj: \
     "$(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" \
@@ -320,7 +325,6 @@ AllTests.obj: \
     "$(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" \
@@ -368,6 +372,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -376,6 +381,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -416,7 +422,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -430,6 +436,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -441,7 +448,6 @@ TestI.obj: \
     "$(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" \
@@ -464,7 +470,6 @@ TestI.obj: \
     "$(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" \
@@ -492,6 +497,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -500,6 +506,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -540,7 +547,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -554,6 +561,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -565,7 +573,6 @@ Server.obj: \
     "$(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" \
@@ -588,7 +595,6 @@ Server.obj: \
     "$(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" \
@@ -621,6 +627,7 @@ Service.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -629,6 +636,7 @@ Service.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -669,7 +677,7 @@ Service.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -683,6 +691,7 @@ Service.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -694,7 +703,6 @@ Service.obj: \
     "$(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" \
@@ -717,7 +725,6 @@ Service.obj: \
     "$(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" \
diff --git a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
index 994a87e9024..84b4a9526d0 100644
--- a/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
+++ b/cpp/test/IceGrid/noRestartUpdate/AllTests.cpp
@@ -544,7 +544,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 #  if defined(__i386)
         iceboxExe += "32";
 #  endif
-#  if defined(ICE_CPP11)
+#  if defined(ICE_CPP11_COMPILER)
         iceboxExe += "++11";
 #  endif
 #endif
diff --git a/cpp/test/IceGrid/replicaGroup/.depend.mak b/cpp/test/IceGrid/replicaGroup/.depend.mak
index b77a53a08c5..78a0378a133 100755
--- a/cpp/test/IceGrid/replicaGroup/.depend.mak
+++ b/cpp/test/IceGrid/replicaGroup/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -224,6 +227,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -232,6 +236,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -272,7 +277,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -286,6 +291,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -297,7 +303,6 @@ AllTests.obj: \
     "$(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" \
@@ -320,7 +325,6 @@ AllTests.obj: \
     "$(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" \
@@ -368,6 +372,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -376,6 +381,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -416,7 +422,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -430,6 +436,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -441,7 +448,6 @@ TestI.obj: \
     "$(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" \
@@ -464,7 +470,6 @@ TestI.obj: \
     "$(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" \
@@ -492,6 +497,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -500,6 +506,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -540,7 +547,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -554,6 +561,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -565,7 +573,6 @@ Server.obj: \
     "$(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" \
@@ -588,7 +595,6 @@ Server.obj: \
     "$(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" \
@@ -621,6 +627,7 @@ Service.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -629,6 +636,7 @@ Service.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -669,7 +677,7 @@ Service.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -683,6 +691,7 @@ Service.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -694,7 +703,6 @@ Service.obj: \
     "$(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" \
@@ -717,7 +725,6 @@ Service.obj: \
     "$(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" \
diff --git a/cpp/test/IceGrid/replication/.depend.mak b/cpp/test/IceGrid/replication/.depend.mak
index 69d02294086..424ac8034e2 100755
--- a/cpp/test/IceGrid/replication/.depend.mak
+++ b/cpp/test/IceGrid/replication/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -224,6 +227,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -232,6 +236,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -272,7 +277,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -286,6 +291,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -297,7 +303,6 @@ AllTests.obj: \
     "$(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" \
@@ -320,7 +325,6 @@ AllTests.obj: \
     "$(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" \
@@ -368,6 +372,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -376,6 +381,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -416,7 +422,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -430,6 +436,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -441,7 +448,6 @@ TestI.obj: \
     "$(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" \
@@ -464,7 +470,6 @@ TestI.obj: \
     "$(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" \
@@ -492,6 +497,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -500,6 +506,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -540,7 +547,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -554,6 +561,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -565,7 +573,6 @@ Server.obj: \
     "$(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" \
@@ -588,7 +595,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/IceGrid/session/.depend.mak b/cpp/test/IceGrid/session/.depend.mak
index ba646e88178..933177e4034 100755
--- a/cpp/test/IceGrid/session/.depend.mak
+++ b/cpp/test/IceGrid/session/.depend.mak
@@ -19,6 +19,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -27,6 +28,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -61,7 +63,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -70,13 +72,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Glacier2\PermissionsVerifier.h" \
     "$(includedir)\Glacier2\SSLInfo.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
@@ -105,6 +107,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -113,6 +116,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -153,7 +157,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -167,6 +171,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -178,7 +183,6 @@ Client.obj: \
     "$(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" \
@@ -201,7 +205,6 @@ Client.obj: \
     "$(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" \
@@ -238,6 +241,7 @@ AllTests.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -246,6 +250,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -280,7 +285,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -294,6 +299,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -305,7 +311,6 @@ AllTests.obj: \
     "$(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" \
@@ -328,7 +333,6 @@ AllTests.obj: \
     "$(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" \
@@ -378,6 +382,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -386,6 +391,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -426,7 +432,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -440,6 +446,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -451,7 +458,6 @@ Server.obj: \
     "$(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" \
@@ -474,7 +480,6 @@ Server.obj: \
     "$(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" \
@@ -512,6 +517,7 @@ PermissionsVerifier.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -520,6 +526,7 @@ PermissionsVerifier.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -560,7 +567,7 @@ PermissionsVerifier.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -574,6 +581,7 @@ PermissionsVerifier.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -585,7 +593,6 @@ PermissionsVerifier.obj: \
     "$(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" \
@@ -608,7 +615,6 @@ PermissionsVerifier.obj: \
     "$(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" \
diff --git a/cpp/test/IceGrid/simple/.depend.mak b/cpp/test/IceGrid/simple/.depend.mak
index fbaf06d7aa7..ba2e54050a4 100755
--- a/cpp/test/IceGrid/simple/.depend.mak
+++ b/cpp/test/IceGrid/simple/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -243,6 +246,7 @@ AllTests.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -250,6 +254,7 @@ AllTests.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -278,7 +283,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -291,6 +296,7 @@ AllTests.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -302,7 +308,6 @@ AllTests.obj: \
     "$(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" \
@@ -324,7 +329,6 @@ AllTests.obj: \
     "$(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" \
@@ -368,6 +372,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -376,6 +381,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -416,7 +422,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -430,6 +436,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -441,7 +448,6 @@ TestI.obj: \
     "$(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" \
@@ -464,7 +470,6 @@ TestI.obj: \
     "$(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" \
@@ -492,6 +497,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -500,6 +506,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -540,7 +547,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -554,6 +561,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -565,7 +573,6 @@ Server.obj: \
     "$(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" \
@@ -588,7 +595,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/IceGrid/update/.depend.mak b/cpp/test/IceGrid/update/.depend.mak
index 2211a51b3f7..2fc87e56322 100755
--- a/cpp/test/IceGrid/update/.depend.mak
+++ b/cpp/test/IceGrid/update/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -230,6 +233,7 @@ AllTests.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -238,6 +242,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -272,7 +277,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -286,6 +291,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -297,7 +303,6 @@ AllTests.obj: \
     "$(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" \
@@ -320,7 +325,6 @@ AllTests.obj: \
     "$(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" \
@@ -368,6 +372,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -376,6 +381,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -416,7 +422,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -430,6 +436,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -441,7 +448,6 @@ TestI.obj: \
     "$(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" \
@@ -464,7 +470,6 @@ TestI.obj: \
     "$(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" \
@@ -492,6 +497,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -500,6 +506,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -540,7 +547,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -554,6 +561,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -565,7 +573,6 @@ Server.obj: \
     "$(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" \
@@ -588,7 +595,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/IceGrid/update/AllTests.cpp b/cpp/test/IceGrid/update/AllTests.cpp
index a5f6e1f1761..79edfeda68d 100644
--- a/cpp/test/IceGrid/update/AllTests.cpp
+++ b/cpp/test/IceGrid/update/AllTests.cpp
@@ -560,7 +560,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
 #  if defined(__i386)
         iceboxExe += "32";
 #  endif
-#  if defined(ICE_CPP11)
+#  if defined(ICE_CPP11_COMPILER)
         iceboxExe += "++11";
 #  endif
 #endif
diff --git a/cpp/test/IceSSL/configuration/.depend.mak b/cpp/test/IceSSL/configuration/.depend.mak
index 9229e4a5d73..d404ab117a9 100755
--- a/cpp/test/IceSSL/configuration/.depend.mak
+++ b/cpp/test/IceSSL/configuration/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
@@ -223,6 +226,7 @@ AllTests.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -231,6 +235,7 @@ AllTests.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -271,7 +276,7 @@ AllTests.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -285,6 +290,7 @@ AllTests.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -296,7 +302,6 @@ AllTests.obj: \
     "$(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" \
@@ -319,7 +324,6 @@ AllTests.obj: \
     "$(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" \
@@ -354,6 +358,7 @@ TestI.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -362,6 +367,7 @@ TestI.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -402,7 +408,7 @@ TestI.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -416,6 +422,7 @@ TestI.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -427,7 +434,6 @@ TestI.obj: \
     "$(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" \
@@ -450,7 +456,6 @@ TestI.obj: \
     "$(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" \
@@ -486,6 +491,7 @@ Server.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -494,6 +500,7 @@ Server.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -534,7 +541,7 @@ Server.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -548,6 +555,7 @@ Server.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -559,7 +567,6 @@ Server.obj: \
     "$(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" \
@@ -582,7 +589,6 @@ Server.obj: \
     "$(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" \
diff --git a/cpp/test/IceStorm/federation/.depend.mak b/cpp/test/IceStorm/federation/.depend.mak
index 51c9a594753..d47a900c4b7 100755
--- a/cpp/test/IceStorm/federation/.depend.mak
+++ b/cpp/test/IceStorm/federation/.depend.mak
@@ -16,6 +16,7 @@ Event.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Event.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Event.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Event.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Publisher.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Publisher.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Publisher.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Publisher.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Publisher.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Publisher.obj: \
     "$(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" \
@@ -222,6 +225,7 @@ Subscriber.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -230,6 +234,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -270,7 +275,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -284,6 +289,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -295,7 +301,6 @@ Subscriber.obj: \
     "$(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" \
@@ -318,7 +323,6 @@ Subscriber.obj: \
     "$(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" \
diff --git a/cpp/test/IceStorm/federation2/.depend.mak b/cpp/test/IceStorm/federation2/.depend.mak
index 0a36fff01d3..46a81acef02 100755
--- a/cpp/test/IceStorm/federation2/.depend.mak
+++ b/cpp/test/IceStorm/federation2/.depend.mak
@@ -16,6 +16,7 @@ Event.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Event.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Event.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Event.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -116,6 +118,7 @@ Publisher.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -123,6 +126,7 @@ Publisher.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -151,7 +155,7 @@ Publisher.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -164,6 +168,7 @@ Publisher.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -175,7 +180,6 @@ Publisher.obj: \
     "$(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" \
@@ -197,7 +201,6 @@ Publisher.obj: \
     "$(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" \
@@ -227,6 +230,7 @@ Subscriber.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -235,6 +239,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -275,7 +280,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -289,6 +294,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -300,7 +306,6 @@ Subscriber.obj: \
     "$(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" \
@@ -323,7 +328,6 @@ Subscriber.obj: \
     "$(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" \
diff --git a/cpp/test/IceStorm/rep1/.depend.mak b/cpp/test/IceStorm/rep1/.depend.mak
index 883aade2386..64d7a1b0430 100755
--- a/cpp/test/IceStorm/rep1/.depend.mak
+++ b/cpp/test/IceStorm/rep1/.depend.mak
@@ -16,6 +16,7 @@ Single.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Single.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Single.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Single.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Publisher.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Publisher.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Publisher.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Publisher.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Publisher.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Publisher.obj: \
     "$(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" \
@@ -247,6 +250,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -254,6 +258,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -282,7 +287,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -295,6 +300,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -306,7 +312,6 @@ Subscriber.obj: \
     "$(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" \
@@ -328,7 +333,6 @@ Subscriber.obj: \
     "$(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" \
@@ -379,6 +383,7 @@ Sub.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -386,6 +391,7 @@ Sub.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -414,7 +420,7 @@ Sub.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -427,6 +433,7 @@ Sub.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -438,7 +445,6 @@ Sub.obj: \
     "$(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" \
@@ -460,7 +466,6 @@ Sub.obj: \
     "$(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" \
diff --git a/cpp/test/IceStorm/repgrid/.depend.mak b/cpp/test/IceStorm/repgrid/.depend.mak
index adda0464171..cc8cea436d7 100755
--- a/cpp/test/IceStorm/repgrid/.depend.mak
+++ b/cpp/test/IceStorm/repgrid/.depend.mak
@@ -16,6 +16,7 @@ Single.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Single.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Single.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Single.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Client.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Client.obj: \
     "$(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" \
diff --git a/cpp/test/IceStorm/repstress/.depend.mak b/cpp/test/IceStorm/repstress/.depend.mak
index f1fe645ff9d..744bff612e3 100755
--- a/cpp/test/IceStorm/repstress/.depend.mak
+++ b/cpp/test/IceStorm/repstress/.depend.mak
@@ -19,6 +19,7 @@ Single.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -27,6 +28,7 @@ Single.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -61,7 +63,7 @@ Single.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -70,13 +72,13 @@ Single.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -97,6 +99,7 @@ Controller.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -105,6 +108,7 @@ Controller.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -139,7 +143,7 @@ Controller.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -148,13 +152,13 @@ Controller.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -177,6 +181,7 @@ Publisher.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -185,6 +190,7 @@ Publisher.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -225,7 +231,7 @@ Publisher.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -239,6 +245,7 @@ Publisher.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -250,7 +257,6 @@ Publisher.obj: \
     "$(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" \
@@ -273,7 +279,6 @@ Publisher.obj: \
     "$(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" \
@@ -327,6 +332,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\ProxyHandle.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -334,6 +340,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\LocalObjectF.h" \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\Ice\Plugin.h" \
@@ -362,7 +369,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -375,6 +382,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -386,7 +394,6 @@ Subscriber.obj: \
     "$(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" \
@@ -408,7 +415,6 @@ Subscriber.obj: \
     "$(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" \
@@ -440,6 +446,7 @@ Control.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -448,6 +455,7 @@ Control.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -488,7 +496,7 @@ Control.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -502,6 +510,7 @@ Control.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -513,7 +522,6 @@ Control.obj: \
     "$(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" \
@@ -536,7 +544,6 @@ Control.obj: \
     "$(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" \
diff --git a/cpp/test/IceStorm/single/.depend.mak b/cpp/test/IceStorm/single/.depend.mak
index 50560f88fee..fd6375acde5 100755
--- a/cpp/test/IceStorm/single/.depend.mak
+++ b/cpp/test/IceStorm/single/.depend.mak
@@ -16,6 +16,7 @@ Single.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Single.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Single.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Single.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Publisher.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Publisher.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Publisher.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Publisher.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Publisher.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Publisher.obj: \
     "$(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" \
@@ -222,6 +225,7 @@ Subscriber.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -230,6 +234,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -270,7 +275,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -284,6 +289,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -295,7 +301,6 @@ Subscriber.obj: \
     "$(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" \
@@ -318,7 +323,6 @@ Subscriber.obj: \
     "$(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" \
diff --git a/cpp/test/IceStorm/stress/.depend.mak b/cpp/test/IceStorm/stress/.depend.mak
index bacf31b965e..fd67bc06cc3 100755
--- a/cpp/test/IceStorm/stress/.depend.mak
+++ b/cpp/test/IceStorm/stress/.depend.mak
@@ -16,6 +16,7 @@ Event.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Event.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Event.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Event.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -96,6 +98,7 @@ Publisher.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -104,6 +107,7 @@ Publisher.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -144,7 +148,7 @@ Publisher.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -158,6 +162,7 @@ Publisher.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -169,7 +174,6 @@ Publisher.obj: \
     "$(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" \
@@ -192,7 +196,6 @@ Publisher.obj: \
     "$(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" \
@@ -224,6 +227,7 @@ Subscriber.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -232,6 +236,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -272,7 +277,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -286,6 +291,7 @@ Subscriber.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -297,7 +303,6 @@ Subscriber.obj: \
     "$(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" \
@@ -320,7 +325,6 @@ Subscriber.obj: \
     "$(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" \
diff --git a/cpp/test/IceUtil/timer/Client.cpp b/cpp/test/IceUtil/timer/Client.cpp
index a893352cb66..a527869e731 100644
--- a/cpp/test/IceUtil/timer/Client.cpp
+++ b/cpp/test/IceUtil/timer/Client.cpp
@@ -15,6 +15,22 @@
 using namespace IceUtil;
 using namespace std;
 
+template<typename T>
+struct TargetLess
+{
+    bool operator()(const T& lhs, const T& rhs) const
+    {
+        if(lhs && rhs)
+        {
+            return *lhs < *rhs;
+        }
+        else
+        {
+            return !lhs && rhs;
+        }
+    }
+};
+
 class TestTask : public IceUtil::TimerTask, IceUtil::Monitor<IceUtil::Mutex>
 {
 public:
@@ -96,7 +112,7 @@ private:
     IceUtil::Time _scheduledTime;
     int _count;
 };
-typedef IceUtil::Handle<TestTask> TestTaskPtr;
+ICE_DEFINE_PTR(TestTaskPtr, TestTask);
 
 
 class DestroyTask : public IceUtil::TimerTask, IceUtil::Monitor<IceUtil::Mutex>
@@ -134,7 +150,7 @@ private:
     IceUtil::TimerPtr _timer;
     bool _run;
 };
-typedef IceUtil::Handle<DestroyTask> DestroyTaskPtr;
+ICE_DEFINE_PTR(DestroyTaskPtr, DestroyTask);
 
 int main(int, char**)
 {
@@ -143,7 +159,7 @@ int main(int, char**)
         IceUtil::TimerPtr timer = new IceUtil::Timer();
 
         {
-            TestTaskPtr task = new TestTask();
+            TestTaskPtr task = ICE_MAKE_SHARED(TestTask);
             timer->schedule(task, IceUtil::Time());
             task->waitForRun();
             task->clear();
@@ -165,7 +181,7 @@ int main(int, char**)
         }
 
         {
-            TestTaskPtr task = new TestTask();
+            TestTaskPtr task = ICE_MAKE_SHARED(TestTask);
             test(!timer->cancel(task));
             timer->schedule(task, IceUtil::Time::seconds(1));
             test(!task->hasRun() && timer->cancel(task) && !task->hasRun());
@@ -179,7 +195,7 @@ int main(int, char**)
             IceUtil::Time start = IceUtil::Time::now(IceUtil::Time::Monotonic) + IceUtil::Time::milliSeconds(500);
             for(int i = 0; i < 20; ++i)
             {
-                tasks.push_back(new TestTask(IceUtil::Time::milliSeconds(500 + i * 50)));
+                tasks.push_back(ICE_MAKE_SHARED(TestTask, IceUtil::Time::milliSeconds(500 + i * 50)));
             }
 
             random_shuffle(tasks.begin(), tasks.end());
@@ -196,7 +212,11 @@ int main(int, char**)
 
             test(IceUtil::Time::now(IceUtil::Time::Monotonic) > start);
 
+#ifdef ICE_CPP11_MAPPING
+            sort(tasks.begin(), tasks.end(), TargetLess<shared_ptr<TestTask>>());
+#else
             sort(tasks.begin(), tasks.end());
+#endif
             for(p = tasks.begin(); p + 1 != tasks.end(); ++p)
             {
                 if((*p)->getRunTime() > (*(p + 1))->getRunTime())
@@ -207,7 +227,7 @@ int main(int, char**)
         }
 
         {
-            TestTaskPtr task = new TestTask();
+            TestTaskPtr task = ICE_MAKE_SHARED(TestTask);
             timer->scheduleRepeated(task, IceUtil::Time::milliSeconds(20));
             IceUtil::ThreadControl::sleep(IceUtil::Time::milliSeconds(500));
             test(task->hasRun());
@@ -227,7 +247,7 @@ int main(int, char**)
     {
         {
             IceUtil::TimerPtr timer = new IceUtil::Timer();
-            DestroyTaskPtr destroyTask = new DestroyTask(timer);
+            DestroyTaskPtr destroyTask = ICE_MAKE_SHARED(DestroyTask, timer);
             timer->schedule(destroyTask, IceUtil::Time());
             destroyTask->waitForRun();
             try
@@ -241,7 +261,7 @@ int main(int, char**)
         }
         {
             IceUtil::TimerPtr timer = new IceUtil::Timer();
-            TestTaskPtr testTask = new TestTask();
+            TestTaskPtr testTask = ICE_MAKE_SHARED(TestTask);
             timer->schedule(testTask, IceUtil::Time());
             timer->destroy();
             try
diff --git a/cpp/test/Makefile b/cpp/test/Makefile
index 83555938843..ae9994a3c45 100644
--- a/cpp/test/Makefile
+++ b/cpp/test/Makefile
@@ -10,6 +10,12 @@
 top_srcdir	= ..
 
 include $(top_srcdir)/config/Make.rules
+ifeq ($(CPP11_MAPPING),yes)
+SUBDIRS		= IceUtil \
+		  Slice \
+		  Ice
+else
+
 
 SUBDIRS		= IceUtil \
 		  Slice \
@@ -24,6 +30,7 @@ SUBDIRS		:= $(SUBDIRS) \
 		   Glacier2 \
 		   IceGrid
 endif
+endif
 
 .PHONY: $(EVERYTHING) $(SUBDIRS)
 
diff --git a/cpp/test/Makefile.mak b/cpp/test/Makefile.mak
index ecd60946b01..650f43b2528 100644
--- a/cpp/test/Makefile.mak
+++ b/cpp/test/Makefile.mak
@@ -15,6 +15,10 @@ top_srcdir	= ..
 
 SUBDIRS		= Ice
 
+!elseif "$(CPP11_MAPPING)" == "yes"
+SUBDIRS		= IceUtil \
+		  Slice \
+		  Ice
 !elseif "$(CPP_COMPILER)" == "VC100"
 SUBDIRS		= IceUtil \
 		  Slice \
diff --git a/cpp/test/Slice/errorDetection/DictionaryRedefinition.err b/cpp/test/Slice/errorDetection/DictionaryRedefinition.err
index cdf3844e1f4..a09dbc4846b 100644
--- a/cpp/test/Slice/errorDetection/DictionaryRedefinition.err
+++ b/cpp/test/Slice/errorDetection/DictionaryRedefinition.err
@@ -1,6 +1 @@
-DictionaryRedefinition.ice:15: illegal identifier: `Dictionary' differs from keyword `dictionary' only in capitalization
-DictionaryRedefinition.ice:15: keyword `dictionary' cannot be used as dictionary name
-DictionaryRedefinition.ice:16: illegal identifier: `Dictionary' differs from keyword `dictionary' only in capitalization
-DictionaryRedefinition.ice:16: redefinition of dictionary `dictionary' as dictionary
-DictionaryRedefinition.ice:16: keyword `dictionary' cannot be used as dictionary name
 DictionaryRedefinition.ice:18: redefinition of dictionary `foo' as dictionary
diff --git a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice
index a3996cce063..553e0bd4254 100644
--- a/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice
+++ b/cpp/test/Slice/errorDetection/DictionaryRedefinition.ice
@@ -12,8 +12,8 @@
 module Test
 {
 
-dictionary<int, long> Dictionary;
-dictionary<int, long> Dictionary;
+// dictionary<int, long> Dictionary;
+// dictionary<int, long> Dictionary;
 dictionary<int, long> foo;
 dictionary<int, long> foo;
 
diff --git a/cpp/test/Slice/errorDetection/IdentAsKeyword.err b/cpp/test/Slice/errorDetection/IdentAsKeyword.err
index 0d6512d4601..d3bbb497a7b 100644
--- a/cpp/test/Slice/errorDetection/IdentAsKeyword.err
+++ b/cpp/test/Slice/errorDetection/IdentAsKeyword.err
@@ -1,92 +1,85 @@
-IdentAsKeyword.ice:15: illegal identifier: `INTERFACE' differs from keyword `interface' only in capitalization
-IdentAsKeyword.ice:17: illegal identifier: `Void' differs from keyword `void' only in capitalization
-IdentAsKeyword.ice:17: keyword `void' cannot be used as exception name
+IdentAsKeyword.ice:15: syntax error
+IdentAsKeyword.ice:17: `Void': an exception can be defined only at module scope
 IdentAsKeyword.ice:18: keyword `int' cannot be used as exception name
-IdentAsKeyword.ice:20: illegal identifier: `OUT' differs from keyword `out' only in capitalization
-IdentAsKeyword.ice:20: keyword `out' cannot be used as struct name
+IdentAsKeyword.ice:18: `int': an exception can be defined only at module scope
+IdentAsKeyword.ice:20: `OUT': a structure can be defined only at module scope
 IdentAsKeyword.ice:21: keyword `double' cannot be used as struct name
-IdentAsKeyword.ice:23: illegal identifier: `Int' differs from keyword `int' only in capitalization
-IdentAsKeyword.ice:23: keyword `int' cannot be used as data member name
+IdentAsKeyword.ice:21: `double': a structure can be defined only at module scope
+IdentAsKeyword.ice:23: `s1': a structure can be defined only at module scope
+IdentAsKeyword.ice:24: `s2': a structure can be defined only at module scope
 IdentAsKeyword.ice:24: keyword `byte' cannot be used as data member name
-IdentAsKeyword.ice:25: illegal identifier: `Int' differs from keyword `int' only in capitalization
-IdentAsKeyword.ice:25: keyword `int' cannot be used as data member name
+IdentAsKeyword.ice:25: `s3': a structure can be defined only at module scope
+IdentAsKeyword.ice:26: `s4': a structure can be defined only at module scope
 IdentAsKeyword.ice:26: keyword `byte' cannot be used as data member name
-IdentAsKeyword.ice:28: illegal identifier: `inTERface' differs from keyword `interface' only in capitalization
-IdentAsKeyword.ice:28: keyword `interface' cannot be used as class name
+IdentAsKeyword.ice:28: `inTERface': a class can be defined only at module scope
 IdentAsKeyword.ice:29: keyword `interface' cannot be used as class name
-IdentAsKeyword.ice:31: illegal identifier: `MOdule' differs from keyword `module' only in capitalization
-IdentAsKeyword.ice:31: keyword `module' cannot be used as class name
+IdentAsKeyword.ice:29: `interface': a class can be defined only at module scope
+IdentAsKeyword.ice:31: `MOdule': a class can be defined only at module scope
 IdentAsKeyword.ice:32: keyword `module' cannot be used as class name
-IdentAsKeyword.ice:32: redefinition of class `module'
-IdentAsKeyword.ice:34: illegal identifier: `extendS' differs from keyword `extends' only in capitalization
-IdentAsKeyword.ice:34: keyword `extends' cannot be used as data member name
-IdentAsKeyword.ice:35: redefinition of class `C'
+IdentAsKeyword.ice:32: `module': a class can be defined only at module scope
+IdentAsKeyword.ice:34: `C': a class can be defined only at module scope
+IdentAsKeyword.ice:35: `C': a class can be defined only at module scope
 IdentAsKeyword.ice:35: keyword `extends' cannot be used as data member name
+IdentAsKeyword.ice:36: `D': a class can be defined only at module scope
 IdentAsKeyword.ice:36: keyword `extends' cannot be used as data member name
 IdentAsKeyword.ice:38: keyword `local' cannot be used as interface name
-IdentAsKeyword.ice:39: illegal identifier: `Local' differs from keyword `local' only in capitalization
-IdentAsKeyword.ice:39: keyword `local' cannot be used as interface name
+IdentAsKeyword.ice:38: `local': an interface can be defined only at module scope
+IdentAsKeyword.ice:39: `Local': an interface can be defined only at module scope
 IdentAsKeyword.ice:41: keyword `Object' cannot be used as interface name
-IdentAsKeyword.ice:42: illegal identifier: `object' differs from keyword `Object' only in capitalization
-IdentAsKeyword.ice:42: keyword `Object' cannot be used as interface name
-IdentAsKeyword.ice:42: redefinition of interface `Object'
+IdentAsKeyword.ice:41: `Object': an interface can be defined only at module scope
+IdentAsKeyword.ice:42: `object': an interface can be defined only at module scope
 IdentAsKeyword.ice:43: keyword `long' cannot be used as interface name
-IdentAsKeyword.ice:45: illegal identifier: `impLEments' differs from keyword `implements' only in capitalization
-IdentAsKeyword.ice:45: keyword `implements' cannot be used as sequence name
-IdentAsKeyword.ice:46: redefinition of sequence `implements' as sequence
+IdentAsKeyword.ice:43: `long': an interface can be defined only at module scope
+IdentAsKeyword.ice:45: `impLEments': a sequence can be defined only at module scope
+IdentAsKeyword.ice:46: sequence `implements' differs only in capitalization from sequence `impLEments'
 IdentAsKeyword.ice:46: keyword `implements' cannot be used as sequence name
+IdentAsKeyword.ice:47: `short': a sequence can be defined only at module scope
 IdentAsKeyword.ice:47: keyword `short' cannot be used as sequence name
 IdentAsKeyword.ice:49: syntax error
-IdentAsKeyword.ice:50: illegal identifier: `moDule' differs from keyword `module' only in capitalization
-IdentAsKeyword.ice:50: syntax error
+IdentAsKeyword.ice:50: `moDule' is not defined
+IdentAsKeyword.ice:52: `throws': a dictionary can be defined only at module scope
 IdentAsKeyword.ice:52: keyword `throws' cannot be used as dictionary name
-IdentAsKeyword.ice:53: illegal identifier: `thRows' differs from keyword `throws' only in capitalization
-IdentAsKeyword.ice:53: redefinition of dictionary `throws' as dictionary
-IdentAsKeyword.ice:53: keyword `throws' cannot be used as dictionary name
-IdentAsKeyword.ice:54: illegal identifier: `LOCALobject' differs from keyword `LocalObject' only in capitalization
-IdentAsKeyword.ice:54: keyword `LocalObject' cannot be used as dictionary name
+IdentAsKeyword.ice:53: dictionary `thRows' differs only in capitalization from dictionary `throws'
+IdentAsKeyword.ice:54: `LOCALobject': a dictionary can be defined only at module scope
 IdentAsKeyword.ice:56: syntax error
-IdentAsKeyword.ice:57: illegal identifier: `MODULE' differs from keyword `module' only in capitalization
-IdentAsKeyword.ice:57: syntax error
+IdentAsKeyword.ice:57: `MODULE' is not defined
 IdentAsKeyword.ice:59: syntax error
-IdentAsKeyword.ice:60: illegal identifier: `OUT' differs from keyword `out' only in capitalization
-IdentAsKeyword.ice:60: syntax error
+IdentAsKeyword.ice:60: `d4': a dictionary can be defined only at module scope
 IdentAsKeyword.ice:62: syntax error
-IdentAsKeyword.ice:63: illegal identifier: `VOID' differs from keyword `void' only in capitalization
-IdentAsKeyword.ice:63: syntax error
-IdentAsKeyword.ice:63: illegal identifier: `VOID' differs from keyword `void' only in capitalization
+IdentAsKeyword.ice:63: `VOID' is an exception, which cannot be used as a type
 IdentAsKeyword.ice:65: keyword `local' cannot be used as enumeration name
-IdentAsKeyword.ice:65: redefinition of interface `local' as enumeration
-IdentAsKeyword.ice:66: illegal identifier: `LOCAL' differs from keyword `local' only in capitalization
-IdentAsKeyword.ice:66: keyword `local' cannot be used as enumeration name
-IdentAsKeyword.ice:66: redefinition of interface `local' as enumeration
-IdentAsKeyword.ice:66: enumerator `c' differs only in capitalization from class `C'
+IdentAsKeyword.ice:65: `local': an enumeration can be defined only at module scope
+IdentAsKeyword.ice:66: enumeration `LOCAL' differs only in capitalization from enumeration `local'
+IdentAsKeyword.ice:68: `e1': an enumeration can be defined only at module scope
 IdentAsKeyword.ice:68: keyword `long' cannot be used as enumerator
 IdentAsKeyword.ice:68: keyword `byte' cannot be used as enumerator
-IdentAsKeyword.ice:69: illegal identifier: `LONG' differs from keyword `long' only in capitalization
-IdentAsKeyword.ice:69: keyword `long' cannot be used as enumerator
-IdentAsKeyword.ice:69: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization
-IdentAsKeyword.ice:69: keyword `byte' cannot be used as enumerator
-IdentAsKeyword.ice:71: keyword `module' cannot be used as operation name
-IdentAsKeyword.ice:72: illegal identifier: `mODule' differs from keyword `module' only in capitalization
-IdentAsKeyword.ice:72: keyword `module' cannot be used as operation name
-IdentAsKeyword.ice:74: keyword `exception' cannot be used as operation name
-IdentAsKeyword.ice:75: illegal identifier: `EXception' differs from keyword `exception' only in capitalization
-IdentAsKeyword.ice:75: keyword `exception' cannot be used as operation name
+IdentAsKeyword.ice:69: `e2': an enumeration can be defined only at module scope
+IdentAsKeyword.ice:71: `i1': an interface can be defined only at module scope
+IdentAsKeyword.ice:72: `i2': an interface can be defined only at module scope
+IdentAsKeyword.ice:74: `i3': an interface can be defined only at module scope
+IdentAsKeyword.ice:75: `i4': an interface can be defined only at module scope
+IdentAsKeyword.ice:77: `i5': an interface can be defined only at module scope
 IdentAsKeyword.ice:77: syntax error
-IdentAsKeyword.ice:78: illegal identifier: `OUT' differs from keyword `out' only in capitalization
-IdentAsKeyword.ice:78: syntax error
-IdentAsKeyword.ice:80: keyword `byte' cannot be used as parameter name
-IdentAsKeyword.ice:81: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization
-IdentAsKeyword.ice:81: keyword `byte' cannot be used as parameter name
-IdentAsKeyword.ice:83: keyword `byte' cannot be used as parameter name
-IdentAsKeyword.ice:84: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization
-IdentAsKeyword.ice:84: keyword `byte' cannot be used as parameter name
+IdentAsKeyword.ice:78: `i6': an interface can be defined only at module scope
+IdentAsKeyword.ice:80: `i7': an interface can be defined only at module scope
+IdentAsKeyword.ice:81: `i8': an interface can be defined only at module scope
+IdentAsKeyword.ice:83: `i9': an interface can be defined only at module scope
+IdentAsKeyword.ice:84: `i10': an interface can be defined only at module scope
+IdentAsKeyword.ice:86: `true': an interface can be defined only at module scope
 IdentAsKeyword.ice:88: illegal leading underscore in identifier `_a'
+IdentAsKeyword.ice:88: `_a': an interface can be defined only at module scope
 IdentAsKeyword.ice:89: illegal leading underscore in identifier `_true'
+IdentAsKeyword.ice:89: `_true': an interface can be defined only at module scope
 IdentAsKeyword.ice:90: illegal leading underscore in identifier `_true'
+IdentAsKeyword.ice:90: `_true': an interface can be defined only at module scope
 IdentAsKeyword.ice:92: illegal trailing underscore in identifier `b_'
+IdentAsKeyword.ice:92: `b_': an interface can be defined only at module scope
 IdentAsKeyword.ice:94: illegal double underscore in identifier `b__c'
+IdentAsKeyword.ice:94: `b__c': an interface can be defined only at module scope
 IdentAsKeyword.ice:95: illegal double underscore in identifier `b___c'
+IdentAsKeyword.ice:95: `b___c': an interface can be defined only at module scope
 IdentAsKeyword.ice:97: illegal underscore in identifier `a_b'
+IdentAsKeyword.ice:97: `a_b': an interface can be defined only at module scope
 IdentAsKeyword.ice:98: illegal underscore in identifier `a_b_c'
+IdentAsKeyword.ice:98: `a_b_c': an interface can be defined only at module scope
+IdentAsKeyword.ice:100: syntax error
diff --git a/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.err b/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.err
index fde90f00e3e..8d9dc11b53d 100644
--- a/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.err
+++ b/cpp/test/Slice/errorDetection/IdentAsKeywordUnderscore.err
@@ -1,90 +1,83 @@
-IdentAsKeywordUnderscore.ice:15: illegal identifier: `INTERFACE' differs from keyword `interface' only in capitalization
-IdentAsKeywordUnderscore.ice:17: illegal identifier: `Void' differs from keyword `void' only in capitalization
-IdentAsKeywordUnderscore.ice:17: keyword `void' cannot be used as exception name
+IdentAsKeywordUnderscore.ice:15: syntax error
+IdentAsKeywordUnderscore.ice:17: `Void': an exception can be defined only at module scope
 IdentAsKeywordUnderscore.ice:18: keyword `int' cannot be used as exception name
-IdentAsKeywordUnderscore.ice:20: illegal identifier: `OUT' differs from keyword `out' only in capitalization
-IdentAsKeywordUnderscore.ice:20: keyword `out' cannot be used as struct name
+IdentAsKeywordUnderscore.ice:18: `int': an exception can be defined only at module scope
+IdentAsKeywordUnderscore.ice:20: `OUT': a structure can be defined only at module scope
 IdentAsKeywordUnderscore.ice:21: keyword `double' cannot be used as struct name
-IdentAsKeywordUnderscore.ice:23: illegal identifier: `Int' differs from keyword `int' only in capitalization
-IdentAsKeywordUnderscore.ice:23: keyword `int' cannot be used as data member name
+IdentAsKeywordUnderscore.ice:21: `double': a structure can be defined only at module scope
+IdentAsKeywordUnderscore.ice:23: `s1': a structure can be defined only at module scope
+IdentAsKeywordUnderscore.ice:24: `s2': a structure can be defined only at module scope
 IdentAsKeywordUnderscore.ice:24: keyword `byte' cannot be used as data member name
-IdentAsKeywordUnderscore.ice:25: illegal identifier: `Int' differs from keyword `int' only in capitalization
-IdentAsKeywordUnderscore.ice:25: keyword `int' cannot be used as data member name
+IdentAsKeywordUnderscore.ice:25: `s3': a structure can be defined only at module scope
+IdentAsKeywordUnderscore.ice:26: `s4': a structure can be defined only at module scope
 IdentAsKeywordUnderscore.ice:26: keyword `byte' cannot be used as data member name
-IdentAsKeywordUnderscore.ice:28: illegal identifier: `inTERface' differs from keyword `interface' only in capitalization
-IdentAsKeywordUnderscore.ice:28: keyword `interface' cannot be used as class name
+IdentAsKeywordUnderscore.ice:28: `inTERface': a class can be defined only at module scope
 IdentAsKeywordUnderscore.ice:29: keyword `interface' cannot be used as class name
-IdentAsKeywordUnderscore.ice:31: illegal identifier: `MOdule' differs from keyword `module' only in capitalization
-IdentAsKeywordUnderscore.ice:31: keyword `module' cannot be used as class name
+IdentAsKeywordUnderscore.ice:29: `interface': a class can be defined only at module scope
+IdentAsKeywordUnderscore.ice:31: `MOdule': a class can be defined only at module scope
 IdentAsKeywordUnderscore.ice:32: keyword `module' cannot be used as class name
-IdentAsKeywordUnderscore.ice:32: redefinition of class `module'
-IdentAsKeywordUnderscore.ice:34: illegal identifier: `extendS' differs from keyword `extends' only in capitalization
-IdentAsKeywordUnderscore.ice:34: keyword `extends' cannot be used as data member name
-IdentAsKeywordUnderscore.ice:35: redefinition of class `C'
+IdentAsKeywordUnderscore.ice:32: `module': a class can be defined only at module scope
+IdentAsKeywordUnderscore.ice:34: `C': a class can be defined only at module scope
+IdentAsKeywordUnderscore.ice:35: `C': a class can be defined only at module scope
 IdentAsKeywordUnderscore.ice:35: keyword `extends' cannot be used as data member name
+IdentAsKeywordUnderscore.ice:36: `D': a class can be defined only at module scope
 IdentAsKeywordUnderscore.ice:36: keyword `extends' cannot be used as data member name
 IdentAsKeywordUnderscore.ice:38: keyword `local' cannot be used as interface name
-IdentAsKeywordUnderscore.ice:39: illegal identifier: `Local' differs from keyword `local' only in capitalization
-IdentAsKeywordUnderscore.ice:39: keyword `local' cannot be used as interface name
+IdentAsKeywordUnderscore.ice:38: `local': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:39: `Local': an interface can be defined only at module scope
 IdentAsKeywordUnderscore.ice:41: keyword `Object' cannot be used as interface name
-IdentAsKeywordUnderscore.ice:42: illegal identifier: `object' differs from keyword `Object' only in capitalization
-IdentAsKeywordUnderscore.ice:42: keyword `Object' cannot be used as interface name
-IdentAsKeywordUnderscore.ice:42: redefinition of interface `Object'
+IdentAsKeywordUnderscore.ice:41: `Object': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:42: `object': an interface can be defined only at module scope
 IdentAsKeywordUnderscore.ice:43: keyword `long' cannot be used as interface name
-IdentAsKeywordUnderscore.ice:45: illegal identifier: `impLEments' differs from keyword `implements' only in capitalization
-IdentAsKeywordUnderscore.ice:45: keyword `implements' cannot be used as sequence name
-IdentAsKeywordUnderscore.ice:46: redefinition of sequence `implements' as sequence
+IdentAsKeywordUnderscore.ice:43: `long': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:45: `impLEments': a sequence can be defined only at module scope
+IdentAsKeywordUnderscore.ice:46: sequence `implements' differs only in capitalization from sequence `impLEments'
 IdentAsKeywordUnderscore.ice:46: keyword `implements' cannot be used as sequence name
+IdentAsKeywordUnderscore.ice:47: `short': a sequence can be defined only at module scope
 IdentAsKeywordUnderscore.ice:47: keyword `short' cannot be used as sequence name
 IdentAsKeywordUnderscore.ice:49: syntax error
-IdentAsKeywordUnderscore.ice:50: illegal identifier: `moDule' differs from keyword `module' only in capitalization
-IdentAsKeywordUnderscore.ice:50: syntax error
+IdentAsKeywordUnderscore.ice:50: `moDule' is not defined
+IdentAsKeywordUnderscore.ice:52: `throws': a dictionary can be defined only at module scope
 IdentAsKeywordUnderscore.ice:52: keyword `throws' cannot be used as dictionary name
-IdentAsKeywordUnderscore.ice:53: illegal identifier: `thRows' differs from keyword `throws' only in capitalization
-IdentAsKeywordUnderscore.ice:53: redefinition of dictionary `throws' as dictionary
-IdentAsKeywordUnderscore.ice:53: keyword `throws' cannot be used as dictionary name
-IdentAsKeywordUnderscore.ice:54: illegal identifier: `LOCALobject' differs from keyword `LocalObject' only in capitalization
-IdentAsKeywordUnderscore.ice:54: keyword `LocalObject' cannot be used as dictionary name
+IdentAsKeywordUnderscore.ice:53: dictionary `thRows' differs only in capitalization from dictionary `throws'
+IdentAsKeywordUnderscore.ice:54: `LOCALobject': a dictionary can be defined only at module scope
 IdentAsKeywordUnderscore.ice:56: syntax error
-IdentAsKeywordUnderscore.ice:57: illegal identifier: `MODULE' differs from keyword `module' only in capitalization
-IdentAsKeywordUnderscore.ice:57: syntax error
+IdentAsKeywordUnderscore.ice:57: `MODULE' is not defined
 IdentAsKeywordUnderscore.ice:59: syntax error
-IdentAsKeywordUnderscore.ice:60: illegal identifier: `OUT' differs from keyword `out' only in capitalization
-IdentAsKeywordUnderscore.ice:60: syntax error
+IdentAsKeywordUnderscore.ice:60: `d4': a dictionary can be defined only at module scope
 IdentAsKeywordUnderscore.ice:62: syntax error
-IdentAsKeywordUnderscore.ice:63: illegal identifier: `VOID' differs from keyword `void' only in capitalization
-IdentAsKeywordUnderscore.ice:63: syntax error
-IdentAsKeywordUnderscore.ice:63: illegal identifier: `VOID' differs from keyword `void' only in capitalization
+IdentAsKeywordUnderscore.ice:63: `VOID' is an exception, which cannot be used as a type
 IdentAsKeywordUnderscore.ice:65: keyword `local' cannot be used as enumeration name
-IdentAsKeywordUnderscore.ice:65: redefinition of interface `local' as enumeration
-IdentAsKeywordUnderscore.ice:66: illegal identifier: `LOCAL' differs from keyword `local' only in capitalization
-IdentAsKeywordUnderscore.ice:66: keyword `local' cannot be used as enumeration name
-IdentAsKeywordUnderscore.ice:66: redefinition of interface `local' as enumeration
-IdentAsKeywordUnderscore.ice:66: enumerator `c' differs only in capitalization from class `C'
+IdentAsKeywordUnderscore.ice:65: `local': an enumeration can be defined only at module scope
+IdentAsKeywordUnderscore.ice:66: enumeration `LOCAL' differs only in capitalization from enumeration `local'
+IdentAsKeywordUnderscore.ice:68: `e1': an enumeration can be defined only at module scope
 IdentAsKeywordUnderscore.ice:68: keyword `long' cannot be used as enumerator
 IdentAsKeywordUnderscore.ice:68: keyword `byte' cannot be used as enumerator
-IdentAsKeywordUnderscore.ice:69: illegal identifier: `LONG' differs from keyword `long' only in capitalization
-IdentAsKeywordUnderscore.ice:69: keyword `long' cannot be used as enumerator
-IdentAsKeywordUnderscore.ice:69: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization
-IdentAsKeywordUnderscore.ice:69: keyword `byte' cannot be used as enumerator
-IdentAsKeywordUnderscore.ice:71: keyword `module' cannot be used as operation name
-IdentAsKeywordUnderscore.ice:72: illegal identifier: `mODule' differs from keyword `module' only in capitalization
-IdentAsKeywordUnderscore.ice:72: keyword `module' cannot be used as operation name
-IdentAsKeywordUnderscore.ice:74: keyword `exception' cannot be used as operation name
-IdentAsKeywordUnderscore.ice:75: illegal identifier: `EXception' differs from keyword `exception' only in capitalization
-IdentAsKeywordUnderscore.ice:75: keyword `exception' cannot be used as operation name
+IdentAsKeywordUnderscore.ice:69: `e2': an enumeration can be defined only at module scope
+IdentAsKeywordUnderscore.ice:71: `i1': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:72: `i2': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:74: `i3': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:75: `i4': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:77: `i5': an interface can be defined only at module scope
 IdentAsKeywordUnderscore.ice:77: syntax error
-IdentAsKeywordUnderscore.ice:78: illegal identifier: `OUT' differs from keyword `out' only in capitalization
-IdentAsKeywordUnderscore.ice:78: syntax error
-IdentAsKeywordUnderscore.ice:80: keyword `byte' cannot be used as parameter name
-IdentAsKeywordUnderscore.ice:81: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization
-IdentAsKeywordUnderscore.ice:81: keyword `byte' cannot be used as parameter name
-IdentAsKeywordUnderscore.ice:83: keyword `byte' cannot be used as parameter name
-IdentAsKeywordUnderscore.ice:84: illegal identifier: `BYTE' differs from keyword `byte' only in capitalization
-IdentAsKeywordUnderscore.ice:84: keyword `byte' cannot be used as parameter name
+IdentAsKeywordUnderscore.ice:78: `i6': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:80: `i7': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:81: `i8': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:83: `i9': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:84: `i10': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:86: `true': an interface can be defined only at module scope
 IdentAsKeywordUnderscore.ice:88: illegal leading underscore in identifier `_a'
+IdentAsKeywordUnderscore.ice:88: `_a': an interface can be defined only at module scope
 IdentAsKeywordUnderscore.ice:89: illegal leading underscore in identifier `_true'
+IdentAsKeywordUnderscore.ice:89: `_true': an interface can be defined only at module scope
 IdentAsKeywordUnderscore.ice:90: illegal leading underscore in identifier `_true'
+IdentAsKeywordUnderscore.ice:90: `_true': an interface can be defined only at module scope
 IdentAsKeywordUnderscore.ice:92: illegal trailing underscore in identifier `b_'
+IdentAsKeywordUnderscore.ice:92: `b_': an interface can be defined only at module scope
 IdentAsKeywordUnderscore.ice:94: illegal double underscore in identifier `b__c'
+IdentAsKeywordUnderscore.ice:94: `b__c': an interface can be defined only at module scope
 IdentAsKeywordUnderscore.ice:95: illegal double underscore in identifier `b___c'
+IdentAsKeywordUnderscore.ice:95: `b___c': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:97: `a_b': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:98: `a_b_c': an interface can be defined only at module scope
+IdentAsKeywordUnderscore.ice:100: syntax error
diff --git a/cpp/test/Slice/keyword/.depend.mak b/cpp/test/Slice/keyword/.depend.mak
index ca8ae1f5bbd..eb0c6006bbc 100755
--- a/cpp/test/Slice/keyword/.depend.mak
+++ b/cpp/test/Slice/keyword/.depend.mak
@@ -16,6 +16,7 @@ Key.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Key.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Key.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,6 +69,7 @@ Key.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -74,7 +77,6 @@ Key.obj: \
     "$(includedir)\Ice\IncomingAsync.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -100,6 +102,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -108,6 +111,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -148,7 +152,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -162,6 +166,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -173,7 +178,6 @@ Client.obj: \
     "$(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" \
@@ -196,7 +200,6 @@ Client.obj: \
     "$(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" \
diff --git a/cpp/test/Slice/keyword/Client.cpp b/cpp/test/Slice/keyword/Client.cpp
index b91cf2abeda..ea833ebce9d 100644
--- a/cpp/test/Slice/keyword/Client.cpp
+++ b/cpp/test/Slice/keyword/Client.cpp
@@ -16,10 +16,21 @@ using namespace std;
 class breakI : public _cpp_and::_cpp_break
 {
 public:
+    
+#ifdef ICE_CPP11_MAPPING
+    virtual void case_async(::Ice::Int,
+                            function<void (int)> response,
+                            function<void (const exception_ptr&)>,
+                            const ::Ice::Current&)
+    {
+        response(0);
+    }
+#else
     virtual void case_async(const ::_cpp_and::AMD_break_casePtr& cb, ::Ice::Int, const ::Ice::Current&)
     {
         cb->ice_response(0);
     }
+#endif
 };
 
 class charI: public _cpp_and::_cpp_char
@@ -47,9 +58,18 @@ public:
 class doI : public _cpp_and::_cpp_do
 {
 public:
+#ifdef ICE_CPP11_MAPPING
+    virtual void case_async(::Ice::Int,
+                            function<void (int)>,
+                            function<void (const exception_ptr&)>,
+                            const ::Ice::Current&)
+    {
+    }
+#else
     virtual void case_async(const ::_cpp_and::AMD_break_casePtr&, ::Ice::Int, const ::Ice::Current&)
     {
     }
+#endif
     virtual void _cpp_explicit(const ::Ice::Current&) 
     {
     }
@@ -62,10 +82,21 @@ class friendI : public _cpp_and::_cpp_friend
 {
 public:
     virtual _cpp_and::_cpp_auto
-    _cpp_goto(_cpp_and::_cpp_continue, const _cpp_and::_cpp_auto&, const _cpp_and::deletePtr&,
-              const _cpp_and::switchPtr&, const _cpp_and::doPtr&, const _cpp_and::breakPrx&,
-              const _cpp_and::charPrx&, const _cpp_and::switchPrx&, const _cpp_and::doPrx&,
-              ::Ice::Int, ::Ice::Int, ::Ice::Int, ::Ice::Int)
+    _cpp_goto(_cpp_and::_cpp_continue, 
+              const _cpp_and::_cpp_auto&,
+#ifdef ICE_CPP11_MAPPING
+              const _cpp_and::_cpp_delete&,
+#else
+              const _cpp_and::deletePtr&,
+#endif
+              const _cpp_and::switchPtr&,
+              const _cpp_and::doPtr&,
+              const _cpp_and::breakPrxPtr&,
+              const _cpp_and::charPrxPtr&,
+              const _cpp_and::switchPrxPtr&,
+              const _cpp_and::doPrxPtr&,
+              ::Ice::Int, ::Ice::Int,
+              ::Ice::Int, ::Ice::Int)
     {
         return _cpp_and::_cpp_auto();
     }
@@ -78,32 +109,42 @@ public:
 void
 testtypes()
 {
+#ifdef ICE_CPP11_MAPPING
+    _cpp_and::_cpp_continue a = _cpp_and::_cpp_continue::_cpp_asm;
+    test(a == _cpp_and::_cpp_continue::_cpp_asm);
+#else
     _cpp_and::_cpp_continue a = _cpp_and::_cpp_asm;
     test(a);
+#endif
 
     _cpp_and::_cpp_auto b, b2;
     b._cpp_default = 0;
     b2._cpp_default = b._cpp_default;
     b._cpp_default = b2._cpp_default;
 
+#ifdef ICE_CPP11_MAPPING
+    _cpp_and::_cpp_delete c;
+    c._cpp_else = "";
+#else
     _cpp_and::deletePtr c = new _cpp_and::_cpp_delete();
     c->_cpp_else = "";
+#endif
 
-    _cpp_and::breakPrx d;
+    _cpp_and::breakPrxPtr d;
     int d2;
     d->_cpp_case(0, d2);
-    _cpp_and::breakPtr d1 = new breakI();
+    _cpp_and::breakPtr d1 = ICE_MAKE_SHARED(breakI);
 
-    _cpp_and::charPrx e;
+    _cpp_and::charPrxPtr e;
     e->_cpp_explicit();
-    _cpp_and::charPtr e1 = new charI();
+    _cpp_and::charPtr e1 = ICE_MAKE_SHARED(charI);
 
-    _cpp_and::switchPtr f1 = new switchI();
+    _cpp_and::switchPtr f1 = ICE_MAKE_SHARED(switchI);
 
-    _cpp_and::doPrx g;
+    _cpp_and::doPrxPtr g;
     g->_cpp_case(0, d2);
     g->_cpp_explicit();
-    _cpp_and::doPtr g1 = new doI();
+    _cpp_and::doPtr g1 = ICE_MAKE_SHARED(doI);
 
     _cpp_and::_cpp_extern h;
     _cpp_and::_cpp_for i;
@@ -114,7 +155,7 @@ testtypes()
     k._cpp_switch = 1;
     k._cpp_signed = 2;
 
-    _cpp_and::friendPtr l = new friendI();
+    _cpp_and::friendPtr l = ICE_MAKE_SHARED(friendI);
 
     const int m  = _cpp_and::_cpp_template;
     test(m == _cpp_and::_cpp_template);
@@ -127,11 +168,11 @@ run(const Ice::CommunicatorPtr& communicator)
 {
     communicator->getProperties()->setProperty("TestAdapter.Endpoints", "default -p 12010:udp");
     Ice::ObjectAdapterPtr adapter = communicator->createObjectAdapter("TestAdapter");
-    adapter->add(new charI, communicator->stringToIdentity("test"));
+    adapter->add(ICE_MAKE_SHARED(charI), communicator->stringToIdentity("test"));
     adapter->activate();
 
     cout << "Testing operation name... " << flush;
-    _cpp_and::charPrx p = _cpp_and::charPrx::uncheckedCast(
+    _cpp_and::charPrxPtr p = ICE_UNCHECKED_CAST(_cpp_and::charPrx,
         adapter->createProxy(communicator->stringToIdentity("test")));
     p->_cpp_explicit();
     cout << "ok" << endl;
diff --git a/cpp/test/Slice/keyword/Key.ice b/cpp/test/Slice/keyword/Key.ice
index 53bde99901b..a0846e0acb0 100644
--- a/cpp/test/Slice/keyword/Key.ice
+++ b/cpp/test/Slice/keyword/Key.ice
@@ -61,8 +61,8 @@ exception sizeof extends return
 
 local interface friend
 {
-	auto goto(continue if, auto d, delete inline, switch private, do mutable, break* namespace,
-		  char* new, switch* not, do* operator, int or, int protected, int public, int register)
+        auto goto(continue if, auto d, delete inline, switch private, do mutable, break* namespace,
+                  char* new, switch* not, do* operator, int or, int protected, int public, int register)
             throws return, sizeof;
 };
 
diff --git a/cpp/test/Slice/macros/.depend.mak b/cpp/test/Slice/macros/.depend.mak
index 0392268cd73..e850ed85d00 100755
--- a/cpp/test/Slice/macros/.depend.mak
+++ b/cpp/test/Slice/macros/.depend.mak
@@ -16,6 +16,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -24,6 +25,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -58,7 +60,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -67,13 +69,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -98,6 +100,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -106,6 +109,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -146,7 +150,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -160,6 +164,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -171,7 +176,6 @@ Client.obj: \
     "$(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" \
@@ -194,7 +198,6 @@ Client.obj: \
     "$(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" \
diff --git a/cpp/test/Slice/macros/Client.cpp b/cpp/test/Slice/macros/Client.cpp
index 36c26e47b7a..a4fdb957129 100644
--- a/cpp/test/Slice/macros/Client.cpp
+++ b/cpp/test/Slice/macros/Client.cpp
@@ -21,11 +21,11 @@ main(int argc, char* argv[])
     try
     {
         cout << "testing Slice predefined macros... " << flush;
-        DefaultPtr d = new Default();
+        DefaultPtr d = ICE_MAKE_SHARED(Default);
         test(d->x == 10);
         test(d->y == 10);
 
-        CppOnlyPtr c = new CppOnly();
+        CppOnlyPtr c = ICE_MAKE_SHARED(CppOnly);
         test(c->lang == "cpp");
         test(c->version == ICE_INT_VERSION);
         cout << "ok" << endl;
diff --git a/cpp/test/Slice/parser/.depend.mak b/cpp/test/Slice/parser/.depend.mak
index f106724fef2..4b73fea7084 100755
--- a/cpp/test/Slice/parser/.depend.mak
+++ b/cpp/test/Slice/parser/.depend.mak
@@ -21,6 +21,7 @@ CircularA.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -29,6 +30,7 @@ CircularA.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -63,7 +65,7 @@ CircularA.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -72,6 +74,7 @@ CircularA.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -79,7 +82,6 @@ CircularA.obj: \
     "CircularB.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
@@ -100,6 +102,7 @@ CircularB.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -108,6 +111,7 @@ CircularB.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -142,7 +146,7 @@ CircularB.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -151,6 +155,7 @@ CircularB.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -158,7 +163,6 @@ CircularB.obj: \
     "CircularA.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\Outgoing.h" \
     "$(includedir)\Ice\OutgoingAsync.h" \
     "$(includedir)\IceUtil\Timer.h" \
diff --git a/cpp/test/Slice/structure/.depend.mak b/cpp/test/Slice/structure/.depend.mak
index bde39630d82..e73374df995 100755
--- a/cpp/test/Slice/structure/.depend.mak
+++ b/cpp/test/Slice/structure/.depend.mak
@@ -19,6 +19,7 @@ Test.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -27,6 +28,7 @@ Test.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -61,7 +63,7 @@ Test.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -70,13 +72,13 @@ Test.obj: \
     "$(includedir)\Ice\FactoryTable.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
     "$(includedir)\Ice\ResponseHandlerF.h" \
     "$(includedir)\Ice\FactoryTableInit.h" \
     "$(includedir)\Ice\DefaultObjectFactory.h" \
-    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\LocalException.h" \
     "$(includedir)\Ice\BuiltinSequences.h" \
     "$(includedir)\Ice\Outgoing.h" \
@@ -99,6 +101,7 @@ Forward.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -107,6 +110,7 @@ Forward.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\Ice\Proxy.h" \
     "$(includedir)\IceUtil\Mutex.h" \
     "$(includedir)\IceUtil\Lock.h" \
@@ -141,7 +145,7 @@ Forward.obj: \
     "$(includedir)\IceUtil\StringConverter.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -165,6 +169,7 @@ Client.obj: \
     "$(includedir)\IceUtil\Exception.h" \
     "$(includedir)\Ice\ObjectF.h" \
     "$(includedir)\Ice\Handle.h" \
+    "$(includedir)\Ice\ValueF.h" \
     "$(includedir)\Ice\Exception.h" \
     "$(includedir)\Ice\Format.h" \
     "$(includedir)\Ice\StreamF.h" \
@@ -173,6 +178,7 @@ Client.obj: \
     "$(includedir)\Ice\StreamHelpers.h" \
     "$(includedir)\IceUtil\ScopedArray.h" \
     "$(includedir)\IceUtil\Iterator.h" \
+    "$(includedir)\Ice\Traits.h" \
     "$(includedir)\IceUtil\Optional.h" \
     "$(includedir)\IceUtil\UndefSysMacros.h" \
     "$(includedir)\IceUtil\PopDisableWarnings.h" \
@@ -213,7 +219,7 @@ Client.obj: \
     "$(includedir)\Ice\BasicStream.h" \
     "$(includedir)\Ice\Object.h" \
     "$(includedir)\Ice\IncomingAsyncF.h" \
-    "$(includedir)\Ice\ObjectFactoryF.h" \
+    "$(includedir)\Ice\ObjectFactory.h" \
     "$(includedir)\Ice\ObjectFactoryManagerF.h" \
     "$(includedir)\Ice\Buffer.h" \
     "$(includedir)\Ice\Protocol.h" \
@@ -227,6 +233,7 @@ Client.obj: \
     "$(includedir)\Ice\PropertiesAdmin.h" \
     "$(includedir)\Ice\GCObject.h" \
     "$(includedir)\IceUtil\MutexPtrLock.h" \
+    "$(includedir)\Ice\Value.h" \
     "$(includedir)\Ice\Incoming.h" \
     "$(includedir)\Ice\ServantLocatorF.h" \
     "$(includedir)\Ice\ServantManagerF.h" \
@@ -238,7 +245,6 @@ Client.obj: \
     "$(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" \
@@ -261,7 +267,6 @@ Client.obj: \
     "$(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" \
diff --git a/cpp/test/Slice/structure/Client.cpp b/cpp/test/Slice/structure/Client.cpp
index c0b88ebd337..1d91a6e3029 100644
--- a/cpp/test/Slice/structure/Client.cpp
+++ b/cpp/test/Slice/structure/Client.cpp
@@ -38,10 +38,20 @@ allTests(const Ice::CommunicatorPtr& communicator)
     def_s2.il.push_back(2);
     def_s2.il.push_back(3);
     def_s2.sd["abc"] = "def";
+#ifdef ICE_CPP11_MAPPING
+    def_s2.s = {"name"};
+#else
     def_s2.s = new S1("name");
-    def_s2.cls = new C(5);
+#endif
+    def_s2.cls = ICE_MAKE_SHARED(C, 5);
     def_s2.prx = communicator->stringToProxy("test");
 
+#ifndef ICE_CPP11_MAPPING
+    //
+    // cpp:comparable required by tests bellow is only
+    // supported with C++98 mapping.
+    //
+    
     //
     // Change one primitive member at a time.
     //
@@ -248,7 +258,7 @@ allTests(const Ice::CommunicatorPtr& communicator)
         v2.prx = 0;
         test(v1 != v2);
     }
-
+#endif
     cout << "ok" << endl;
 }