17 files changed, 1356 insertions, 890 deletions
diff --git a/cpp/src/IceUtil/.depend.mak b/cpp/src/IceUtil/.depend.mak
deleted file mode 100755
index 0887fbf7c0e..00000000000
--- a/cpp/src/IceUtil/.depend.mak
+++ /dev/null
@@ -1,233 +0,0 @@
-
-ArgVector.obj: \
-	ArgVector.cpp \
-    "ArgVector.h" \
-    "$(includedir)\IceUtil\Config.h" \
-
-Cond.obj: \
-	Cond.cpp \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-
-ConvertUTF.obj: \
-	ConvertUTF.cpp \
-    "ConvertUTF.h" \
-    "Unicode.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-
-CountDownLatch.obj: \
-	CountDownLatch.cpp \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-
-CtrlCHandler.obj: \
-	CtrlCHandler.cpp \
-    "$(includedir)\IceUtil\CtrlCHandler.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-
-Exception.obj: \
-	Exception.cpp \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-
-FileUtil.obj: \
-	FileUtil.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "FileUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-
-InputUtil.obj: \
-	InputUtil.cpp \
-    "$(includedir)\IceUtil\InputUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-
-MutexProtocol.obj: \
-	MutexProtocol.cpp \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Config.h" \
-
-Options.obj: \
-	Options.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-OutputUtil.obj: \
-	OutputUtil.cpp \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "FileUtil.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-
-Random.obj: \
-	Random.cpp \
-    "$(includedir)\IceUtil\Random.h" \
-    "$(includedir)\IceUtil\Config.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\MutexPtrLock.h" \
-
-RecMutex.obj: \
-	RecMutex.cpp \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-
-SHA1.obj: \
-	SHA1.cpp \
-    "$(includedir)\IceUtil\SHA1.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-
-Shared.obj: \
-	Shared.cpp \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-
-StringConverter.obj: \
-	StringConverter.cpp \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "Unicode.h" \
-
-StringUtil.obj: \
-	StringUtil.cpp \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-
-Thread.obj: \
-	Thread.cpp \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.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" \
-
-ThreadException.obj: \
-	ThreadException.cpp \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Time.h" \
-
-Time.obj: \
-	Time.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Time.h" \
-
-Timer.obj: \
-	Timer.cpp \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.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" \
-
-Unicode.obj: \
-	Unicode.cpp \
-    "Unicode.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "ConvertUTF.h" \
-
-UUID.obj: \
-	UUID.cpp \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "$(includedir)\IceUtil\Exception.h" \
diff --git a/cpp/src/IceUtil/CtrlCHandler.cpp b/cpp/src/IceUtil/CtrlCHandler.cpp
index 1105c4c9f25..6eac2e7e05a 100644
--- a/cpp/src/IceUtil/CtrlCHandler.cpp
+++ b/cpp/src/IceUtil/CtrlCHandler.cpp
@@ -55,24 +55,19 @@ CtrlCHandlerException::CtrlCHandlerException(const char* file, int line) :
 {
 }
 
-namespace
-{
-
-const char* ctrlCHandlerName = "IceUtil::CtrlCHandlerException";
-
-}
-
 string
-CtrlCHandlerException::ice_name() const
+CtrlCHandlerException::ice_id() const
 {
-    return ctrlCHandlerName;
+    return "::IceUtil::CtrlCHandlerException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 CtrlCHandlerException*
 CtrlCHandlerException::ice_clone() const
 {
     return new CtrlCHandlerException(*this);
 }
+#endif
 
 void
 CtrlCHandlerException::ice_throw() const
diff --git a/cpp/src/IceUtil/Exception.cpp b/cpp/src/IceUtil/Exception.cpp
index 7b654a5d090..aa3700ca604 100644
--- a/cpp/src/IceUtil/Exception.cpp
+++ b/cpp/src/IceUtil/Exception.cpp
@@ -42,8 +42,7 @@
 #    define DBGHELP_TRANSLATE_TCHAR
 #    include <IceUtil/StringConverter.h>
 #    if _MSC_VER >= 1900
-#       // VS 2015 RC issues this warning for code in DbgHelp.h
-#       pragma warning(disable:4091)
+#       pragma warning(disable:4091) // VS 2015 RC issues this warning for code in DbgHelp.h
 #    endif
 #  endif
 #  include <DbgHelp.h>
@@ -407,18 +406,10 @@ IceUtil::Exception::Exception(const char* file, int line) :
 {
 }
 
-IceUtil::Exception::~Exception() throw()
+IceUtil::Exception::~Exception() ICE_NOEXCEPT
 {
 }
 
-const char* IceUtil::Exception::_name = "IceUtil::Exception";
-
-string
-IceUtil::Exception::ice_name() const
-{
-    return _name;
-}
-
 void
 IceUtil::Exception::ice_print(ostream& out) const
 {
@@ -426,11 +417,11 @@ IceUtil::Exception::ice_print(ostream& out) const
     {
         out << _file << ':' << _line << ": ";
     }
-    out << ice_name();
+    out << ice_id();
 }
 
 const char*
-IceUtil::Exception::what() const throw()
+IceUtil::Exception::what() const ICE_NOEXCEPT
 {
     try
     {
@@ -451,11 +442,41 @@ IceUtil::Exception::what() const throw()
     return "";
 }
 
+string
+IceUtil::Exception::ice_id() const
+{
+    return "::IceUtil::Exception";
+}
+
+#ifdef ICE_CPP11_MAPPING
+exception_ptr
+IceUtil::Exception::ice_clone() const
+{
+    try
+    {
+        ice_throw();
+    }
+    catch(...)
+    {
+        return current_exception();
+    }
+    assert(false);
+    return nullptr; // Make compilers happy
+}
+#else
+
+string
+IceUtil::Exception::ice_name() const
+{
+    return ice_id().substr(2);
+}
+
 IceUtil::Exception*
 IceUtil::Exception::ice_clone() const
 {
     return new Exception(*this);
 }
+#endif
 
 void
 IceUtil::Exception::ice_throw() const
@@ -497,23 +518,23 @@ IceUtil::NullHandleException::NullHandleException(const char* file, int line) :
     }
 }
 
-IceUtil::NullHandleException::~NullHandleException() throw()
+IceUtil::NullHandleException::~NullHandleException() ICE_NOEXCEPT
 {
 }
 
-const char* IceUtil::NullHandleException::_name = "IceUtil::NullHandleException";
-
 string
-IceUtil::NullHandleException::ice_name() const
+IceUtil::NullHandleException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::NullHandleException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::NullHandleException*
 IceUtil::NullHandleException::ice_clone() const
 {
     return new NullHandleException(*this);
 }
+#endif
 
 void
 IceUtil::NullHandleException::ice_throw() const
@@ -532,16 +553,8 @@ IceUtil::IllegalArgumentException::IllegalArgumentException(const char* file, in
 {
 }
 
-IceUtil::IllegalArgumentException::~IllegalArgumentException() throw()
-{
-}
-
-const char* IceUtil::IllegalArgumentException::_name = "IceUtil::IllegalArgumentException";
-
-string
-IceUtil::IllegalArgumentException::ice_name() const
+IceUtil::IllegalArgumentException::~IllegalArgumentException() ICE_NOEXCEPT
 {
-    return _name;
 }
 
 void
@@ -551,11 +564,19 @@ IceUtil::IllegalArgumentException::ice_print(ostream& out) const
     out << ": " << _reason;
 }
 
+string
+IceUtil::IllegalArgumentException::ice_id() const
+{
+    return "::IceUtil::IllegalArgumentException";
+}
+
+#ifndef ICE_CPP11_MAPPING
 IceUtil::IllegalArgumentException*
 IceUtil::IllegalArgumentException::ice_clone() const
 {
     return new IllegalArgumentException(*this);
 }
+#endif
 
 void
 IceUtil::IllegalArgumentException::ice_throw() const
@@ -572,9 +593,6 @@ IceUtil::IllegalArgumentException::reason() const
 //
 // IllegalConversionException
 //
-
-const char* IceUtil::IllegalConversionException::_name = "IceUtil::IllegalConversionException";
-
 IceUtil::IllegalConversionException::IllegalConversionException(const char* file, int line):
     Exception(file, line)
 {}
@@ -585,15 +603,9 @@ IceUtil::IllegalConversionException::IllegalConversionException(const char* file
     _reason(reason)
 {}
 
-IceUtil::IllegalConversionException::~IllegalConversionException() throw()
+IceUtil::IllegalConversionException::~IllegalConversionException() ICE_NOEXCEPT
 {}
 
-string
-IceUtil::IllegalConversionException::ice_name() const
-{
-    return _name;
-}
-
 void
 IceUtil::IllegalConversionException::ice_print(ostream& out) const
 {
@@ -602,11 +614,19 @@ IceUtil::IllegalConversionException::ice_print(ostream& out) const
 
 }
 
+string
+IceUtil::IllegalConversionException::ice_id() const
+{
+    return "::IceUtil::IllegalConversionException";
+}
+
+#ifndef ICE_CPP11_MAPPING
 IceUtil::IllegalConversionException*
 IceUtil::IllegalConversionException::ice_clone() const
 {
     return new IllegalConversionException(*this);
 }
+#endif
 
 void
 IceUtil::IllegalConversionException::ice_throw() const
@@ -628,14 +648,6 @@ IceUtil::SyscallException::SyscallException(const char* file, int line, int err
 {
 }
 
-const char* IceUtil::SyscallException::_name = "IceUtil::SyscallException";
-
-string
-IceUtil::SyscallException::ice_name() const
-{
-    return _name;
-}
-
 void
 IceUtil::SyscallException::ice_print(ostream& os) const
 {
@@ -646,11 +658,19 @@ IceUtil::SyscallException::ice_print(ostream& os) const
     }
 }
 
+string
+IceUtil::SyscallException::ice_id() const
+{
+    return "::IceUtil::SyscallException";
+}
+
+#ifndef ICE_CPP11_MAPPING
 IceUtil::SyscallException*
 IceUtil::SyscallException::ice_clone() const
 {
     return new SyscallException(*this);
 }
+#endif
 
 void
 IceUtil::SyscallException::ice_throw() const
@@ -672,18 +692,10 @@ IceUtil::FileLockException::FileLockException(const char* file, int line, int er
 {
 }
 
-IceUtil::FileLockException::~FileLockException() throw()
+IceUtil::FileLockException::~FileLockException() ICE_NOEXCEPT
 {
 }
 
-const char* IceUtil::FileLockException::_name = "IceUtil::FileLockedException";
-
-string
-IceUtil::FileLockException::ice_name() const
-{
-    return _name;
-}
-
 void
 IceUtil::FileLockException::ice_print(ostream& os) const
 {
@@ -695,11 +707,19 @@ IceUtil::FileLockException::ice_print(ostream& os) const
     }
 }
 
+string
+IceUtil::FileLockException::ice_id() const
+{
+    return "::IceUtil::FileLockException";
+}
+
+#ifndef ICE_CPP11_MAPPING
 IceUtil::FileLockException*
 IceUtil::FileLockException::ice_clone() const
 {
     return new FileLockException(*this);
 }
+#endif
 
 void
 IceUtil::FileLockException::ice_throw() const
@@ -722,23 +742,23 @@ IceUtil::OptionalNotSetException::OptionalNotSetException(const char* file, int
     }
 }
 
-IceUtil::OptionalNotSetException::~OptionalNotSetException() throw()
+IceUtil::OptionalNotSetException::~OptionalNotSetException() ICE_NOEXCEPT
 {
 }
 
-const char* IceUtil::OptionalNotSetException::_name = "IceUtil::OptionalNotSetException";
-
 string
-IceUtil::OptionalNotSetException::ice_name() const
+IceUtil::OptionalNotSetException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::OptionalNotSetException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::OptionalNotSetException*
 IceUtil::OptionalNotSetException::ice_clone() const
 {
     return new OptionalNotSetException(*this);
 }
+#endif
 
 void
 IceUtil::OptionalNotSetException::ice_throw() const
@@ -753,18 +773,10 @@ IceUtil::IconvInitializationException::IconvInitializationException(const char*
 {
 }
 
-IceUtil::IconvInitializationException::~IconvInitializationException() throw()
+IceUtil::IconvInitializationException::~IconvInitializationException() ICE_NOEXCEPT
 {
 }
 
-const char* IceUtil::IconvInitializationException::_name = "IceUtil::IconvInitializationException";
-
-string
-IceUtil::IconvInitializationException::ice_name() const
-{
-    return _name;
-}
-
 void
 IceUtil::IconvInitializationException::ice_print(ostream& out) const
 {
@@ -772,11 +784,19 @@ IceUtil::IconvInitializationException::ice_print(ostream& out) const
     out << ": " << _reason;
 }
 
+string
+IceUtil::IconvInitializationException::ice_id() const
+{
+    return "::IceUtil::IconvInitializationException";
+}
+
+#ifndef ICE_CPP11_MAPPING
 IceUtil::IconvInitializationException*
 IceUtil::IconvInitializationException::ice_clone() const
 {
     return new IconvInitializationException(*this);
 }
+#endif
 
 void
 IceUtil::IconvInitializationException::ice_throw() const
diff --git a/cpp/src/IceUtil/FileUtil.h b/cpp/src/IceUtil/FileUtil.h
deleted file mode 100644
index 3b148f5dce4..00000000000
--- a/cpp/src/IceUtil/FileUtil.h
+++ /dev/null
@@ -1,167 +0,0 @@
-// **********************************************************************
-//
-// Copyright (c) 2003-2016 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_FILE_UTIL_H
-#define ICE_FILE_UTIL_H
-
-#include <IceUtil/Config.h>
-#include <IceUtil/Shared.h>
-#include <IceUtil/Handle.h>
-
-#include <sys/stat.h>
-#include <fcntl.h>
-#include <stdio.h>
-#include <fstream>
-
-namespace IceUtilInternal
-{
-
-extern const ICE_UTIL_API std::string pathsep;
-extern const ICE_UTIL_API std::string separator;
-
-//
-// Detemine if path is an absolute path.
-//
-ICE_UTIL_API bool isAbsolutePath(const std::string&);
-
-//
-// Determine if a file exists.
-//
-ICE_UTIL_API bool fileExists(const std::string&);
-
-//
-// Determine if a directory exists.
-//
-ICE_UTIL_API bool directoryExists(const std::string&);
-
-#ifdef _WIN32
-
-#if defined(__MINGW32__)
-typedef struct _stat structstat;
-#else
-typedef struct _stat64i32 structstat;
-#endif
-
-#ifdef _MSC_VER
-#   define O_RDONLY _O_RDONLY
-#   define O_BINARY _O_BINARY
-
-#   define S_ISDIR(mode) ((mode) & _S_IFDIR)
-#   define S_ISREG(mode) ((mode) & _S_IFREG)
-#endif
-
-#else
-
-typedef struct stat structstat;
-#   define O_BINARY 0
-
-#endif
-
-//
-// OS stat
-//
-ICE_UTIL_API int stat(const std::string&, structstat*);
-ICE_UTIL_API int remove(const std::string&);
-ICE_UTIL_API int rename(const std::string&, const std::string&);
-ICE_UTIL_API int rmdir(const std::string&);
-
-ICE_UTIL_API int mkdir(const std::string&, int);
-ICE_UTIL_API FILE* fopen(const std::string&, const std::string&);
-ICE_UTIL_API FILE* freopen(const std::string&, const std::string&, FILE*);
-ICE_UTIL_API int open(const std::string&, int);
-
-#ifndef ICE_OS_WINRT
-ICE_UTIL_API int getcwd(std::string&);
-#endif
-
-ICE_UTIL_API int unlink(const std::string&);
-ICE_UTIL_API int close(int);
-
-//
-// This class is used to implement process file locking. This class
-// is not intended to do file locking within the same process.
-//
-class ICE_UTIL_API FileLock : public IceUtil::Shared, public IceUtil::noncopyable
-{
-public:
-    //
-    // The constructor opens the given file (eventually creating it)
-    // and acquires a lock on the file or throws FileLockException if
-    // the file couldn't be locked.
-    //
-    // If the lock can be acquired, the process pid is written to the
-    // file.
-    //
-    FileLock(const std::string&);
-    
-    //
-    // The destructor releases the lock and removes the file.
-    //
-    virtual ~FileLock();
-    
-private:
-    
-#ifdef _WIN32
-    HANDLE _fd;
-#else
-    int _fd;
-#endif
-    std::string _path;
-};
-
-typedef IceUtil::Handle<FileLock> FileLockPtr;
-
-class ICE_UTIL_API ifstream : public std::ifstream
-{
-public:
-
-    ifstream();
-    ifstream(const std::string&, std::ios_base::openmode mode = std::ios_base::in);
-    void open(const std::string&, std::ios_base::openmode mode = std::ios_base::in);
-
-#ifdef __SUNPRO_CC
-    using std::ifstream::open;
-#endif
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1900)
-    ifstream(const ifstream&) = delete;
-#endif 
-
-private:
-
-    // Hide const char* definitions since they shouldn't be used.
-    ifstream(const char*);
-    void open(const char*, std::ios_base::openmode mode = std::ios_base::in);
-};
-
-class ICE_UTIL_API ofstream : public std::ofstream
-{
-public:
-
-    ofstream();
-    ofstream(const std::string&, std::ios_base::openmode mode = std::ios_base::out);
-    void open(const std::string&, std::ios_base::openmode mode = std::ios_base::out);
-
-#ifdef __SUNPRO_CC
-    using std::ofstream::open;
-#endif
-
-#if defined(_MSC_VER) && (_MSC_VER >= 1900)
-    ofstream(const ofstream&) = delete;
-#endif 
-
-private:
-
-    // Hide const char* definitions since they shouldn't be used.
-    ofstream(const char*);
-    void open(const char*, std::ios_base::openmode mode = std::ios_base::out);
-};
-
-}
-#endif
diff --git a/cpp/src/IceUtil/IceUtil.rc b/cpp/src/IceUtil/IceUtil.rc
index 976b795ee81..b33bd58314e 100644
--- a/cpp/src/IceUtil/IceUtil.rc
+++ b/cpp/src/IceUtil/IceUtil.rc
@@ -1,17 +1,17 @@
 #include "winver.h"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 3,6,1,0
- PRODUCTVERSION 3,6,1,0
+ FILEVERSION 3,7,0,0
+ PRODUCTVERSION 3,7,0,0
  FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
  FILEFLAGS VS_FF_DEBUG
- #define INTERNALNAME "iceutil36d\0"
- #define ORIGINALFILENAME "iceutil36d.dll\0"
+ #define INTERNALNAME "iceutil37d\0"
+ #define ORIGINALFILENAME "iceutil37d.dll\0"
 #else
  FILEFLAGS 0x0L
- #define INTERNALNAME "iceutil36\0"
- #define ORIGINALFILENAME "iceutil36.dll\0"
+ #define INTERNALNAME "iceutil37\0"
+ #define ORIGINALFILENAME "iceutil37.dll\0"
 #endif
  FILEOS 0x4L
  FILETYPE VFT_DLL
@@ -23,12 +23,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "ZeroC, Inc.\0"
             VALUE "FileDescription", "Ice C++ Utility Library\0"
-            VALUE "FileVersion", "3.6.1\0"
+            VALUE "FileVersion", "3.7.0\0"
             VALUE "InternalName", INTERNALNAME
             VALUE "LegalCopyright", "\251 2003-2015 ZeroC, Inc.\0"
             VALUE "OriginalFilename", ORIGINALFILENAME
             VALUE "ProductName", "Ice\0"
-            VALUE "ProductVersion", "3.6.1\0"
+            VALUE "ProductVersion", "3.7.0\0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/cpp/src/IceUtil/Makefile.mak b/cpp/src/IceUtil/Makefile.mak
deleted file mode 100644
index ae49a10a37d..00000000000
--- a/cpp/src/IceUtil/Makefile.mak
+++ /dev/null
@@ -1,87 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 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.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..
-
-LIBNAME		= $(top_srcdir)\lib\iceutil$(LIBSUFFIX).lib
-DLLNAME 	= $(top_srcdir)\bin\iceutil$(SOVERSION)$(LIBSUFFIX)$(COMPSUFFIX).dll
-
-TARGETS		= $(LIBNAME) $(DLLNAME)
-
-OBJS		= .\ArgVector.obj \
-		  .\Cond.obj \
-		  .\ConvertUTF.obj \
-		  .\CountDownLatch.obj \
-		  .\CtrlCHandler.obj \
-		  .\Exception.obj \
-		  .\FileUtil.obj \
-		  .\InputUtil.obj \
-		  .\MutexProtocol.obj \
-		  .\Options.obj \
-		  .\OutputUtil.obj \
-		  .\Random.obj \
-		  .\RecMutex.obj \
-		  .\SHA1.obj \
-		  .\Shared.obj \
-		  .\StringConverter.obj \
-		  .\StringUtil.obj \
-		  .\Thread.obj \
-		  .\ThreadException.obj \
-		  .\Time.obj \
-		  .\Timer.obj \
-		  .\Unicode.obj \
-		  .\UUID.obj
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-CPPFLAGS	= $(CPPFLAGS) -DICE_UTIL_API_EXPORTS -I.. -DWIN32_LEAN_AND_MEAN
-
-!if "$(GENERATE_PDB)" == "yes"
-PDBFLAGS	= /pdb:$(DLLNAME:.dll=.pdb)
-
-!endif
-
-RES_FILE	= IceUtil.res
-
-!if "$(STATICLIBS)" == "yes"
-
-$(DLLNAME):
-
-$(LIBNAME): $(OBJS)
-	$(AR) $(ARFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ DbgHelp.lib
-
-!else
-
-$(LIBNAME): $(DLLNAME)
-
-$(DLLNAME): $(OBJS) IceUtil.res
-	$(LINK) $(BASE):0x20000000 $(LD_DLLFLAGS) $(PDBFLAGS) $(OBJS) $(PREOUT)$@ $(PRELIBS) $(ICEUTIL_OS_LIBS) \
-		$(RES_FILE)
-	move $(DLLNAME:.dll=.lib) $(LIBNAME)
-	@if exist $@.manifest echo ^ ^ ^ Embedding manifest using $(MT) && \
-		$(MT) -nologo -manifest $@.manifest -outputresource:$@;#2 && del /q $@.manifest
-	@if exist $(DLLNAME:.dll=.exp) del /q $(DLLNAME:.dll=.exp)
-	@if defined SIGN_CERTIFICATE echo ^ ^ ^ Signing $@ && \
-		signtool sign /f "$(SIGN_CERTIFICATE)" /p $(SIGN_PASSWORD) /t $(SIGN_TIMESTAMPSERVER) $@
-
-!endif
-
-clean::
-	-del /q IceUtil.res
-
-install:: all
-	copy $(LIBNAME) "$(install_libdir)"
-	copy $(DLLNAME) "$(install_bindir)"
-
-!if "$(GENERATE_PDB)" == "yes"
-
-install:: all
-	copy $(DLLNAME:.dll=.pdb) "$(install_bindir)"
-
-!endif
diff --git a/cpp/src/IceUtil/Options.cpp b/cpp/src/IceUtil/Options.cpp
index 8f2457732d8..ebfb3eb1208 100644
--- a/cpp/src/IceUtil/Options.cpp
+++ b/cpp/src/IceUtil/Options.cpp
@@ -20,16 +20,14 @@ IceUtilInternal::APIException::APIException(const char* file, int line, const st
 {
 }
 
-IceUtilInternal::APIException::~APIException() throw()
+IceUtilInternal::APIException::~APIException() ICE_NOEXCEPT
 {
 }
 
-const char* IceUtilInternal::APIException::_name = "IceUtilInternal::APIException";
-
 string
-IceUtilInternal::APIException::ice_name() const
+IceUtilInternal::APIException::ice_id() const
 {
-    return _name;
+    return "::IceUtilInternal::APIException";
 }
 
 void
@@ -42,11 +40,13 @@ IceUtilInternal::APIException::ice_print(ostream& out) const
     }
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtilInternal::APIException*
 IceUtilInternal::APIException::ice_clone() const
 {
     return new APIException(*this);
 }
+#endif
 
 void
 IceUtilInternal::APIException::ice_throw() const
@@ -66,16 +66,14 @@ IceUtilInternal::BadOptException::BadOptException(const char* file, int line, co
 {
 }
 
-IceUtilInternal::BadOptException::~BadOptException() throw()
+IceUtilInternal::BadOptException::~BadOptException() ICE_NOEXCEPT
 {
 }
 
-const char* IceUtilInternal::BadOptException::_name = "IceUtilInternal::BadOptException";
-
 string
-IceUtilInternal::BadOptException::ice_name() const
+IceUtilInternal::BadOptException::ice_id() const
 {
-    return _name;
+    return "::IceUtilInternal::BadOptException";
 }
 
 void
@@ -88,11 +86,13 @@ IceUtilInternal::BadOptException::ice_print(ostream& out) const
     }
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtilInternal::BadOptException*
 IceUtilInternal::BadOptException::ice_clone() const
 {
     return new BadOptException(*this);
 }
+#endif
 
 void
 IceUtilInternal::BadOptException::ice_throw() const
diff --git a/cpp/src/IceUtil/RecMutex.cpp b/cpp/src/IceUtil/RecMutex.cpp
index 983b0d0c1f0..f2f973d1f02 100644
--- a/cpp/src/IceUtil/RecMutex.cpp
+++ b/cpp/src/IceUtil/RecMutex.cpp
@@ -10,12 +10,6 @@
 #include <IceUtil/RecMutex.h>
 #include <IceUtil/Exception.h>
 
-//
-// AbstractMutex isn't used anywhere in IceUtil, we include it here
-// to give the compiler a chance to export the class symbols.
-//
-#include <IceUtil/AbstractMutex.h>
-
 using namespace std;
 
 IceUtil::RecMutex::RecMutex() :
diff --git a/cpp/src/IceUtil/ThreadException.cpp b/cpp/src/IceUtil/ThreadException.cpp
index 8b354517d99..c41106820ce 100644
--- a/cpp/src/IceUtil/ThreadException.cpp
+++ b/cpp/src/IceUtil/ThreadException.cpp
@@ -15,20 +15,20 @@ IceUtil::ThreadSyscallException::ThreadSyscallException(const char* file, int li
     SyscallException(file, line, err)
 {
 }
-    
-const char* IceUtil::ThreadSyscallException::_name = "IceUtil::ThreadSyscallException";
 
 string
-IceUtil::ThreadSyscallException::ice_name() const
+IceUtil::ThreadSyscallException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::ThreadSyscallException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::ThreadSyscallException*
 IceUtil::ThreadSyscallException::ice_clone() const
 {
     return new ThreadSyscallException(*this);
 }
+#endif
 
 void
 IceUtil::ThreadSyscallException::ice_throw() const
@@ -41,19 +41,19 @@ IceUtil::ThreadLockedException::ThreadLockedException(const char* file, int line
 {
 }
 
-const char* IceUtil::ThreadLockedException::_name = "IceUtil::ThreadLockedException";
-
 string
-IceUtil::ThreadLockedException::ice_name() const
+IceUtil::ThreadLockedException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::ThreadLockedException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::ThreadLockedException*
 IceUtil::ThreadLockedException::ice_clone() const
 {
     return new ThreadLockedException(*this);
 }
+#endif
 
 void
 IceUtil::ThreadLockedException::ice_throw() const
@@ -66,19 +66,19 @@ IceUtil::ThreadStartedException::ThreadStartedException(const char* file, int li
 {
 }
 
-const char* IceUtil::ThreadStartedException::_name = "IceUtil::ThreadStartedException";
-
 string
-IceUtil::ThreadStartedException::ice_name() const
+IceUtil::ThreadStartedException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::ThreadStartedException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::ThreadStartedException*
 IceUtil::ThreadStartedException::ice_clone() const
 {
     return new ThreadStartedException(*this);
 }
+#endif
 
 void
 IceUtil::ThreadStartedException::ice_throw() const
@@ -91,19 +91,19 @@ IceUtil::ThreadNotStartedException::ThreadNotStartedException(const char* file,
 {
 }
 
-const char* IceUtil::ThreadNotStartedException::_name = "IceUtil::ThreadNotStartedException";
-
 string
-IceUtil::ThreadNotStartedException::ice_name() const
+IceUtil::ThreadNotStartedException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::ThreadNotStartedException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::ThreadNotStartedException*
 IceUtil::ThreadNotStartedException::ice_clone() const
 {
     return new ThreadNotStartedException(*this);
 }
+#endif
 
 void
 IceUtil::ThreadNotStartedException::ice_throw() const
@@ -117,19 +117,19 @@ IceUtil::BadThreadControlException::BadThreadControlException(const char* file,
 {
 }
 
-const char* IceUtil::BadThreadControlException::_name = "IceUtil::BadThreadControlException";
-
 string
-IceUtil::BadThreadControlException::ice_name() const
+IceUtil::BadThreadControlException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::BadThreadControlException";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::BadThreadControlException*
 IceUtil::BadThreadControlException::ice_clone() const
 {
     return new BadThreadControlException(*this);
 }
+#endif
 
 void
 IceUtil::BadThreadControlException::ice_throw() const
@@ -143,13 +143,11 @@ IceUtil::InvalidTimeoutException::InvalidTimeoutException(const char* file, int
     _timeout(timeout)
 {
 }
-    
-const char* IceUtil::InvalidTimeoutException::_name = "IceUtil::InvalidTimeoutException";
 
 string
-IceUtil::InvalidTimeoutException::ice_name() const
+IceUtil::InvalidTimeoutException::ice_id() const
 {
-    return _name;
+    return "::IceUtil::InvalidTimeoutException";
 }
 
 void
@@ -159,11 +157,13 @@ IceUtil::InvalidTimeoutException::ice_print(ostream& os) const
     os << ":\ninvalid timeout: " << _timeout << " seconds";
 }
 
+#ifndef ICE_CPP11_MAPPING
 IceUtil::InvalidTimeoutException*
 IceUtil::InvalidTimeoutException::ice_clone() const
 {
     return new InvalidTimeoutException(*this);
 }
+#endif
 
 void
 IceUtil::InvalidTimeoutException::ice_throw() const
diff --git a/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj b/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj
new file mode 100644
index 00000000000..21bad0ceea5
--- /dev/null
+++ b/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{7B04E1F5-B384-44A5-8F46-E0A3FB0F23B1}</ProjectGuid>
+    <RootNamespace>IceUtil C++11</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp11.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\ArgVector.cpp" />
+    <ClCompile Include="..\..\Cond.cpp" />
+    <ClCompile Include="..\..\ConvertUTF.cpp" />
+    <ClCompile Include="..\..\CountDownLatch.cpp" />
+    <ClCompile Include="..\..\CtrlCHandler.cpp" />
+    <ClCompile Include="..\..\Exception.cpp" />
+    <ClCompile Include="..\..\FileUtil.cpp" />
+    <ClCompile Include="..\..\InputUtil.cpp" />
+    <ClCompile Include="..\..\MutexProtocol.cpp" />
+    <ClCompile Include="..\..\Options.cpp" />
+    <ClCompile Include="..\..\OutputUtil.cpp" />
+    <ClCompile Include="..\..\Random.cpp" />
+    <ClCompile Include="..\..\RecMutex.cpp" />
+    <ClCompile Include="..\..\SHA1.cpp" />
+    <ClCompile Include="..\..\Shared.cpp" />
+    <ClCompile Include="..\..\StringConverter.cpp" />
+    <ClCompile Include="..\..\StringUtil.cpp" />
+    <ClCompile Include="..\..\Thread.cpp" />
+    <ClCompile Include="..\..\ThreadException.cpp" />
+    <ClCompile Include="..\..\Time.cpp" />
+    <ClCompile Include="..\..\Timer.cpp" />
+    <ClCompile Include="..\..\Unicode.cpp" />
+    <ClCompile Include="..\..\UUID.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Atomic.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Cond.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Config.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\CountDownLatch.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\CtrlCHandler.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\DisableWarnings.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Exception.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\FileUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Functional.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Handle.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\IceUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\IconvStringConverter.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\InputUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Iterator.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Lock.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Monitor.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Mutex.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexProtocol.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrLock.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrTryLock.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Optional.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Options.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\OutputUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\PopDisableWarnings.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\PushDisableWarnings.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Random.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\RecMutex.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\ScannerConfig.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\ScopedArray.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\SHA1.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Shared.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\StringConverter.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\StringUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Thread.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\ThreadException.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Time.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Timer.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h" />
+    <ClInclude Include="..\..\ArgVector.h" />
+    <ClInclude Include="..\..\ConvertUTF.h" />
+    <ClInclude Include="..\..\StopWatch.h" />
+    <ClInclude Include="..\..\Unicode.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceUtil.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj.filters b/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj.filters
new file mode 100644
index 00000000000..73a009d9230
--- /dev/null
+++ b/cpp/src/IceUtil/msbuild/iceutil++11/iceutil++11.vcxproj.filters
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{47ED10C7-EC63-4EA7-A7AE-D7378402851B}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{11279344-6550-4CA2-9A43-20B50E3BDD4B}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{84B010E6-6952-4B4B-A751-C6F9CDF443F4}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\ArgVector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Cond.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ConvertUTF.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\CountDownLatch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\CtrlCHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Exception.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\FileUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\InputUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\MutexProtocol.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Options.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\OutputUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Random.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RecMutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SHA1.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Shared.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\StringConverter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\StringUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Thread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThreadException.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Time.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Timer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Unicode.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UUID.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Atomic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Cond.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\CountDownLatch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\CtrlCHandler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\DisableWarnings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Exception.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\FileUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Functional.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Handle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\IceUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\IconvStringConverter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\InputUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Iterator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Lock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Monitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexProtocol.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrLock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrTryLock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Optional.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Options.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\OutputUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\PopDisableWarnings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\PushDisableWarnings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Random.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\RecMutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\ScannerConfig.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\ScopedArray.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\SHA1.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Shared.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\StringConverter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\StringUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Thread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\ThreadException.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Timer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ArgVector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ConvertUTF.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\StopWatch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Unicode.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceUtil.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj
new file mode 100644
index 00000000000..6e5b58d5a03
--- /dev/null
+++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{4D1A5110-3176-44BA-8BBB-57BF56519B9F}</ProjectGuid>
+    <RootNamespace>IceUtil</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.cpp98.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_UTIL_API_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>rpcrt4.lib;advapi32.lib;DbgHelp.lib</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\ArgVector.cpp" />
+    <ClCompile Include="..\..\Cond.cpp" />
+    <ClCompile Include="..\..\ConvertUTF.cpp" />
+    <ClCompile Include="..\..\CountDownLatch.cpp" />
+    <ClCompile Include="..\..\CtrlCHandler.cpp" />
+    <ClCompile Include="..\..\Exception.cpp" />
+    <ClCompile Include="..\..\FileUtil.cpp" />
+    <ClCompile Include="..\..\InputUtil.cpp" />
+    <ClCompile Include="..\..\MutexProtocol.cpp" />
+    <ClCompile Include="..\..\Options.cpp" />
+    <ClCompile Include="..\..\OutputUtil.cpp" />
+    <ClCompile Include="..\..\Random.cpp" />
+    <ClCompile Include="..\..\RecMutex.cpp" />
+    <ClCompile Include="..\..\SHA1.cpp" />
+    <ClCompile Include="..\..\Shared.cpp" />
+    <ClCompile Include="..\..\StringConverter.cpp" />
+    <ClCompile Include="..\..\StringUtil.cpp" />
+    <ClCompile Include="..\..\Thread.cpp" />
+    <ClCompile Include="..\..\ThreadException.cpp" />
+    <ClCompile Include="..\..\Time.cpp" />
+    <ClCompile Include="..\..\Timer.cpp" />
+    <ClCompile Include="..\..\Unicode.cpp" />
+    <ClCompile Include="..\..\UUID.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Atomic.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Cond.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Config.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\CountDownLatch.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\CtrlCHandler.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\DisableWarnings.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Exception.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\FileUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Functional.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Handle.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\IceUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\IconvStringConverter.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\InputUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Iterator.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Lock.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Monitor.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Mutex.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexProtocol.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrLock.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrTryLock.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Optional.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Options.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\OutputUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\PopDisableWarnings.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\PushDisableWarnings.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Random.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\RecMutex.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\ScannerConfig.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\ScopedArray.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\SHA1.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Shared.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\StringConverter.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\StringUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Thread.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\ThreadException.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Time.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Timer.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h" />
+    <ClInclude Include="..\..\ArgVector.h" />
+    <ClInclude Include="..\..\ConvertUTF.h" />
+    <ClInclude Include="..\..\StopWatch.h" />
+    <ClInclude Include="..\..\Unicode.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceUtil.rc" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters
new file mode 100644
index 00000000000..7fdbf281f23
--- /dev/null
+++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{ED03E3E4-C50D-4FE0-9F5A-53834B8A5FBE}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{B8DEA2A2-85A6-4081-9E3D-3636F2BDEAE8}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{FA20320F-747C-4806-8AE9-35F73C2C002D}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\ArgVector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Cond.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ConvertUTF.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\CountDownLatch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\CtrlCHandler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Exception.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\FileUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\InputUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\MutexProtocol.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Options.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\OutputUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Random.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RecMutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SHA1.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Shared.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\StringConverter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\StringUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Thread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThreadException.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Time.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Timer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Unicode.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UUID.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Atomic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Cond.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\CountDownLatch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\CtrlCHandler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\DisableWarnings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Exception.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\FileUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Functional.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Handle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\IceUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\IconvStringConverter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\InputUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Iterator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Lock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Monitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexProtocol.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrLock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrTryLock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Optional.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Options.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\OutputUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\PopDisableWarnings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\PushDisableWarnings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Random.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\RecMutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\ScannerConfig.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\ScopedArray.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\SHA1.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Shared.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\StringConverter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\StringUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Thread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\ThreadException.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Timer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ArgVector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ConvertUTF.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\StopWatch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Unicode.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\..\IceUtil.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj b/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj
new file mode 100644
index 00000000000..abd4f073d95
--- /dev/null
+++ b/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj
@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|ARM">
+      <Configuration>Debug</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|ARM">
+      <Configuration>Release</Configuration>
+      <Platform>ARM</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{045BD844-1D32-41AB-9824-BE11617A0097}</ProjectGuid>
+    <DefaultLanguage>en-US</DefaultLanguage>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+    <AppContainerApplication>true</AppContainerApplication>
+    <ApplicationType>Windows Store</ApplicationType>
+    <WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
+    <ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>StaticLibrary</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="PropertySheets">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICEUTIL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICEUTIL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICEUTIL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+    <Lib>
+      <AdditionalDependencies>
+      </AdditionalDependencies>
+    </Lib>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICEUTIL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICEUTIL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <PreprocessorDefinitions>ICE_BUILDING_ICEUTIL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="..\..\ArgVector.cpp" />
+    <ClCompile Include="..\..\Cond.cpp" />
+    <ClCompile Include="..\..\ConvertUTF.cpp" />
+    <ClCompile Include="..\..\CountDownLatch.cpp" />
+    <ClCompile Include="..\..\Exception.cpp" />
+    <ClCompile Include="..\..\FileUtil.cpp" />
+    <ClCompile Include="..\..\InputUtil.cpp" />
+    <ClCompile Include="..\..\MutexProtocol.cpp" />
+    <ClCompile Include="..\..\Options.cpp" />
+    <ClCompile Include="..\..\OutputUtil.cpp" />
+    <ClCompile Include="..\..\Random.cpp" />
+    <ClCompile Include="..\..\RecMutex.cpp" />
+    <ClCompile Include="..\..\SHA1.cpp" />
+    <ClCompile Include="..\..\Shared.cpp" />
+    <ClCompile Include="..\..\StringConverter.cpp" />
+    <ClCompile Include="..\..\StringUtil.cpp" />
+    <ClCompile Include="..\..\Thread.cpp" />
+    <ClCompile Include="..\..\ThreadException.cpp" />
+    <ClCompile Include="..\..\Time.cpp" />
+    <ClCompile Include="..\..\Timer.cpp" />
+    <ClCompile Include="..\..\Unicode.cpp" />
+    <ClCompile Include="..\..\UUID.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Atomic.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Cond.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Config.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\CountDownLatch.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\CtrlCHandler.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\DisableWarnings.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Exception.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\FileUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Functional.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Handle.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\IceUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\IconvStringConverter.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\InputUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Iterator.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Lock.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Monitor.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Mutex.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexProtocol.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrLock.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrTryLock.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Optional.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Options.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\OutputUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\PopDisableWarnings.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\PushDisableWarnings.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Random.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\RecMutex.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\ScannerConfig.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\ScopedArray.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\SHA1.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Shared.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\StringConverter.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\StringUtil.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Thread.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\ThreadException.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Time.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\Timer.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h" />
+    <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h" />
+    <ClInclude Include="..\..\ArgVector.h" />
+    <ClInclude Include="..\..\ConvertUTF.h" />
+    <ClInclude Include="..\..\StopWatch.h" />
+    <ClInclude Include="..\..\Unicode.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
+\ No newline at end of file
diff --git a/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj.filters b/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj.filters
new file mode 100644
index 00000000000..0923c6f6835
--- /dev/null
+++ b/cpp/src/IceUtil/msbuild/iceutiluwp++11/iceutiluwp++11.vcxproj.filters
@@ -0,0 +1,216 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <ClCompile Include="..\..\ArgVector.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ConvertUTF.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Cond.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\CountDownLatch.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Exception.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\FileUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\InputUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\MutexProtocol.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Options.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\OutputUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Random.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\RecMutex.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\SHA1.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Unicode.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Timer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Time.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\ThreadException.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Thread.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\StringConverter.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\Shared.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\StringUtil.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\UUID.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\..\ArgVector.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Atomic.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Cond.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Config.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\ConvertUTF.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\CountDownLatch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\CtrlCHandler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\DisableWarnings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Exception.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\FileUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Functional.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\IceUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\IconvStringConverter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\InputUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Iterator.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Lock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Monitor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Mutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexProtocol.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrLock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\MutexPtrTryLock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Optional.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Options.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\OutputUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\PopDisableWarnings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\PushDisableWarnings.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Random.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\RecMutex.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\ScannerConfig.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\ScopedArray.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\SHA1.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Shared.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\StopWatch.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\StringConverter.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\StringUtil.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Thread.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\ThreadException.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Time.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Timer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\Unicode.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\..\..\include\IceUtil\Handle.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{61a65a3d-af61-4bb7-b532-a2ec945fbc84}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{ef63f803-e282-4ddb-a5b9-9dfc079b26be}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{4a95b250-fe90-4762-9440-47baf982c6c4}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+</Project>
+\ No newline at end of file
diff --git a/cpp/src/IceUtil/winrt/.depend.mak b/cpp/src/IceUtil/winrt/.depend.mak
deleted file mode 100755
index c128cb16238..00000000000
--- a/cpp/src/IceUtil/winrt/.depend.mak
+++ /dev/null
@@ -1,217 +0,0 @@
-
-$(ARCH)\$(CONFIG)\ArgVector.obj: \
-	..\ArgVector.cpp \
-    "..\..\..\src\IceUtil\ArgVector.h" \
-    "$(includedir)\IceUtil\Config.h" \
-
-$(ARCH)\$(CONFIG)\Cond.obj: \
-	..\Cond.cpp \
-    "$(includedir)\IceUtil\Cond.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-
-$(ARCH)\$(CONFIG)\ConvertUTF.obj: \
-	..\ConvertUTF.cpp \
-    "..\..\..\src\IceUtil\ConvertUTF.h" \
-    "..\..\..\src\IceUtil\Unicode.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-
-$(ARCH)\$(CONFIG)\CountDownLatch.obj: \
-	..\CountDownLatch.cpp \
-    "$(includedir)\IceUtil\CountDownLatch.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-
-$(ARCH)\$(CONFIG)\Exception.obj: \
-	..\Exception.cpp \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-$(ARCH)\$(CONFIG)\FileUtil.obj: \
-	..\FileUtil.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "..\..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-
-$(ARCH)\$(CONFIG)\InputUtil.obj: \
-	..\InputUtil.cpp \
-    "$(includedir)\IceUtil\InputUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-
-$(ARCH)\$(CONFIG)\MutexProtocol.obj: \
-	..\MutexProtocol.cpp \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Config.h" \
-
-$(ARCH)\$(CONFIG)\Options.obj: \
-	..\Options.cpp \
-    "$(includedir)\IceUtil\Options.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-
-$(ARCH)\$(CONFIG)\OutputUtil.obj: \
-	..\OutputUtil.cpp \
-    "$(includedir)\IceUtil\OutputUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "..\..\..\src\IceUtil\FileUtil.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-
-$(ARCH)\$(CONFIG)\Random.obj: \
-	..\Random.cpp \
-    "$(includedir)\IceUtil\Random.h" \
-    "$(includedir)\IceUtil\Config.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\MutexPtrLock.h" \
-
-$(ARCH)\$(CONFIG)\RecMutex.obj: \
-	..\RecMutex.cpp \
-    "$(includedir)\IceUtil\RecMutex.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\AbstractMutex.h" \
-
-$(ARCH)\$(CONFIG)\SHA1.obj: \
-	..\SHA1.cpp \
-    "$(includedir)\IceUtil\SHA1.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\UniquePtr.h" \
-
-$(ARCH)\$(CONFIG)\Shared.obj: \
-	..\Shared.cpp \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-
-$(ARCH)\$(CONFIG)\StringConverter.obj: \
-	..\StringConverter.cpp \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\MutexPtrLock.h" \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Time.h" \
-    "$(includedir)\IceUtil\Mutex.h" \
-    "$(includedir)\IceUtil\Lock.h" \
-    "$(includedir)\IceUtil\MutexProtocol.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "..\..\..\src\IceUtil\Unicode.h" \
-
-$(ARCH)\$(CONFIG)\StringUtil.obj: \
-	..\StringUtil.cpp \
-    "$(includedir)\IceUtil\StringUtil.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "$(includedir)\IceUtil\ScopedArray.h" \
-
-$(ARCH)\$(CONFIG)\Thread.obj: \
-	..\Thread.cpp \
-    "$(includedir)\IceUtil\Thread.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.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" \
-
-$(ARCH)\$(CONFIG)\ThreadException.obj: \
-	..\ThreadException.cpp \
-    "$(includedir)\IceUtil\ThreadException.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Time.h" \
-
-$(ARCH)\$(CONFIG)\Time.obj: \
-	..\Time.cpp \
-    "$(includedir)\IceUtil\DisableWarnings.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Time.h" \
-
-$(ARCH)\$(CONFIG)\Timer.obj: \
-	..\Timer.cpp \
-    "$(includedir)\IceUtil\Timer.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Thread.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" \
-
-$(ARCH)\$(CONFIG)\Unicode.obj: \
-	..\Unicode.cpp \
-    "..\..\..\src\IceUtil\Unicode.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\StringConverter.h" \
-    "$(includedir)\IceUtil\Exception.h" \
-    "$(includedir)\IceUtil\Shared.h" \
-    "$(includedir)\IceUtil\Atomic.h" \
-    "$(includedir)\IceUtil\Handle.h" \
-    "..\..\..\src\IceUtil\ConvertUTF.h" \
-
-$(ARCH)\$(CONFIG)\UUID.obj: \
-	..\UUID.cpp \
-    "$(includedir)\IceUtil\UUID.h" \
-    "$(includedir)\IceUtil\Config.h" \
-    "$(includedir)\IceUtil\Random.h" \
-    "$(includedir)\IceUtil\Exception.h" \
diff --git a/cpp/src/IceUtil/winrt/Makefile.mak b/cpp/src/IceUtil/winrt/Makefile.mak
deleted file mode 100644
index 066424188e3..00000000000
--- a/cpp/src/IceUtil/winrt/Makefile.mak
+++ /dev/null
@@ -1,61 +0,0 @@
-# **********************************************************************
-#
-# Copyright (c) 2003-2016 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.
-#
-# **********************************************************************
-
-top_srcdir	= ..\..\..
-LIBNAME		= $(SDK_LIBRARY_PATH)\iceutil.lib
-TARGETS		= $(LIBNAME)
-SOURCE_DIR	= ..
-
-TARGETS		= $(LIBNAME)
-
-OBJS		= $(ARCH)\$(CONFIG)\ArgVector.obj \
-		  $(ARCH)\$(CONFIG)\Cond.obj \
-		  $(ARCH)\$(CONFIG)\ConvertUTF.obj \
-		  $(ARCH)\$(CONFIG)\CountDownLatch.obj \
-		  $(ARCH)\$(CONFIG)\Exception.obj \
-		  $(ARCH)\$(CONFIG)\FileUtil.obj \
-		  $(ARCH)\$(CONFIG)\InputUtil.obj \
-		  $(ARCH)\$(CONFIG)\MutexProtocol.obj \
-		  $(ARCH)\$(CONFIG)\Options.obj \
-		  $(ARCH)\$(CONFIG)\OutputUtil.obj \
-		  $(ARCH)\$(CONFIG)\Random.obj \
-		  $(ARCH)\$(CONFIG)\RecMutex.obj \
-		  $(ARCH)\$(CONFIG)\SHA1.obj \
-		  $(ARCH)\$(CONFIG)\Shared.obj \
-		  $(ARCH)\$(CONFIG)\StringConverter.obj \
-		  $(ARCH)\$(CONFIG)\StringUtil.obj \
-		  $(ARCH)\$(CONFIG)\Thread.obj \
-		  $(ARCH)\$(CONFIG)\ThreadException.obj \
-		  $(ARCH)\$(CONFIG)\Time.obj \
-		  $(ARCH)\$(CONFIG)\Timer.obj \
-		  $(ARCH)\$(CONFIG)\Unicode.obj \
-		  $(ARCH)\$(CONFIG)\UUID.obj
-
-SRCS		= $(OBJS:.obj=.cpp)
-SRCS		= $(SRCS:x86\=)
-SRCS		= $(SRCS:x64\=)
-SRCS		= $(SRCS:arm\=)
-SRCS		= $(SRCS:Retail\=..\)
-SRCS		= $(SRCS:Debug\=..\)
-
-PDBNAME		= $(LIBNAME:.lib=.pdb)
-CPPFLAGS        = /Fd$(PDBNAME) $(CPPFLAGS) -I..\..\ -DICE_BUILDING_ICEUTIL -DWIN32_LEAN_AND_MEAN
-
-!include $(top_srcdir)/config/Make.rules.mak
-
-
-$(LIBNAME): $(OBJS) sdks
-	$(AR) $(ARFLAGS) $(OBJS) /out:$(LIBNAME)
-
-clean::
-	-del /q $(ARCH)\$(CONFIG)\*.obj
-	-del /q $(PDBNAME)
-
-install:: all
-