ICEE_ -> ICE_

author: Matthew Newhook <matthew@zeroc.com> 2005-08-12 04:44:58 +0000
committer: Matthew Newhook <matthew@zeroc.com> 2005-08-12 04:44:58 +0000
commit: 708d97e4bd4acf9d7c1bad093d0c3847282b09c2 (patch)
tree: f6d6de12f2b778f67d52906c8978578bb278b4e6 /cppe/src
parent: http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=439 (diff)
download: ice-708d97e4bd4acf9d7c1bad093d0c3847282b09c2.tar.bz2
ice-708d97e4bd4acf9d7c1bad093d0c3847282b09c2.tar.xz
ice-708d97e4bd4acf9d7c1bad093d0c3847282b09c2.zip
65 files changed, 569 insertions, 569 deletions
diff --git a/cppe/src/IceE/Acceptor.h b/cppe/src/IceE/Acceptor.h
index 4a51f58810f..909ec91dcce 100644
--- a/cppe/src/IceE/Acceptor.h
+++ b/cppe/src/IceE/Acceptor.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_ACCEPTOR_H
-#define ICEE_ACCEPTOR_H
+#ifndef ICE_ACCEPTOR_H
+#define ICE_ACCEPTOR_H
 
 #include <IceE/TransceiverF.h>
 #include <IceE/InstanceF.h>
@@ -31,7 +31,7 @@ namespace IceInternal
 
 class Endpoint;
 
-class ICEE_API Acceptor : public ::IceUtil::Shared
+class ICE_API Acceptor : public ::IceUtil::Shared
 {
 public:
 
diff --git a/cppe/src/IceE/AcceptorF.h b/cppe/src/IceE/AcceptorF.h
index 9a15da39c40..1bc9cbe9784 100644
--- a/cppe/src/IceE/AcceptorF.h
+++ b/cppe/src/IceE/AcceptorF.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_ACCEPTOR_F_H
-#define ICEE_ACCEPTOR_F_H
+#ifndef ICE_ACCEPTOR_F_H
+#define ICE_ACCEPTOR_F_H
 
 #include <IceE/Handle.h>
 
@@ -16,8 +16,8 @@ namespace IceInternal
 {
 
 class Acceptor;
-ICEE_API void incRef(Acceptor*);
-ICEE_API void decRef(Acceptor*);
+ICE_API void incRef(Acceptor*);
+ICE_API void decRef(Acceptor*);
 typedef Handle<Acceptor> AcceptorPtr;
 
 }
diff --git a/cppe/src/IceE/BasicStream.cpp b/cppe/src/IceE/BasicStream.cpp
index da94f272226..ca009bf3a8a 100644
--- a/cppe/src/IceE/BasicStream.cpp
+++ b/cppe/src/IceE/BasicStream.cpp
@@ -310,7 +310,7 @@ IceInternal::BasicStream::endWriteEncaps()
     Int sz = static_cast<Int>(b.size() - start); // Size includes size and version.
     Byte* dest = &(*(b.begin() + start));
 
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
     const Byte* src = reinterpret_cast<const Byte*>(&sz) + sizeof(Int) - 1;
     *dest++ = *src--;
     *dest++ = *src--;
@@ -482,7 +482,7 @@ IceInternal::BasicStream::endWriteSlice()
 {
     Int sz = static_cast<Int>(b.size() - _writeSlice + sizeof(Int));
     Byte* dest = &(*(b.begin() + _writeSlice - sizeof(Int)));
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
     const Byte* src = reinterpret_cast<const Byte*>(&sz) + sizeof(Int) - 1;
     *dest++ = *src--;
     *dest++ = *src--;
@@ -686,7 +686,7 @@ IceInternal::BasicStream::write(Short v)
     Container::size_type pos = b.size();
     resize(pos + sizeof(Short));
     Byte* dest = &b[pos];
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
     const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Short) - 1;
     *dest++ = *src--;
     *dest = *src;
@@ -707,7 +707,7 @@ IceInternal::BasicStream::read(Short& v)
     }
     const Byte* src = &(*i);
     i += sizeof(Short);
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
     Byte* dest = reinterpret_cast<Byte*>(&v) + sizeof(Short) - 1;
     *dest-- = *src++;
     *dest = *src;
@@ -727,7 +727,7 @@ IceInternal::BasicStream::write(const vector<Short>& v)
     {
 	Container::size_type pos = b.size();
 	resize(pos + sz * sizeof(Short));
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
 	const Byte* src = reinterpret_cast<const Byte*>(&v[0]) + sizeof(Short) - 1;
 	Byte* dest = &(*(b.begin() + pos));
 	for(int j = 0 ; j < sz ; ++j)
@@ -753,7 +753,7 @@ IceInternal::BasicStream::read(vector<Short>& v)
 	Container::iterator begin = i;
 	i += sz * static_cast<int>(sizeof(Short));
 	v.resize(sz);
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
 	const Byte* src = &(*begin);
 	Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Short) - 1;
 	for(int j = 0 ; j < sz ; ++j)
@@ -778,7 +778,7 @@ IceInternal::BasicStream::write(Int v)
     Container::size_type pos = b.size();
     resize(pos + sizeof(Int));
     Byte* dest = &b[pos];
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
     const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Int) - 1;
     *dest++ = *src--;
     *dest++ = *src--;
@@ -802,7 +802,7 @@ IceInternal::BasicStream::read(Int& v)
     }
     const Byte* src = &(*i);
     i += sizeof(Int);
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
     Byte* dest = reinterpret_cast<Byte*>(&v) + sizeof(Int) - 1;
     *dest-- = *src++;
     *dest-- = *src++;
@@ -826,7 +826,7 @@ IceInternal::BasicStream::write(const vector<Int>& v)
     {
 	Container::size_type pos = b.size();
 	resize(pos + sz * sizeof(Int));
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
 	const Byte* src = reinterpret_cast<const Byte*>(&v[0]) + sizeof(Int) - 1;
 	Byte* dest = &(*(b.begin() + pos));
 	for(int j = 0 ; j < sz ; ++j)
@@ -854,7 +854,7 @@ IceInternal::BasicStream::read(vector<Int>& v)
 	Container::iterator begin = i;
 	i += sz * static_cast<int>(sizeof(Int));
 	v.resize(sz);
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
 	const Byte* src = &(*begin);
 	Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Int) - 1;
 	for(int j = 0 ; j < sz ; ++j)
@@ -881,7 +881,7 @@ IceInternal::BasicStream::write(Long v)
     Container::size_type pos = b.size();
     resize(pos + sizeof(Long));
     Byte* dest = &b[pos];
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
     const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Long) - 1;
     *dest++ = *src--;
     *dest++ = *src--;
@@ -913,7 +913,7 @@ IceInternal::BasicStream::read(Long& v)
     }
     const Byte* src = &(*i);
     i += sizeof(Long);
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
     Byte* dest = reinterpret_cast<Byte*>(&v) + sizeof(Long) - 1;
     *dest-- = *src++;
     *dest-- = *src++;
@@ -945,7 +945,7 @@ IceInternal::BasicStream::write(const vector<Long>& v)
     {
 	Container::size_type pos = b.size();
 	resize(pos + sz * sizeof(Long));
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
 	const Byte* src = reinterpret_cast<const Byte*>(&v[0]) + sizeof(Long) - 1;
 	Byte* dest = &(*(b.begin() + pos));
 	for(int j = 0 ; j < sz ; ++j)
@@ -977,7 +977,7 @@ IceInternal::BasicStream::read(vector<Long>& v)
 	Container::iterator begin = i;
 	i += sz * static_cast<int>(sizeof(Long));
 	v.resize(sz);
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
 	const Byte* src = &(*begin);
 	Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Long) - 1;
 	for(int j = 0 ; j < sz ; ++j)
@@ -1008,7 +1008,7 @@ IceInternal::BasicStream::write(Float v)
     Container::size_type pos = b.size();
     resize(pos + sizeof(Float));
     Byte* dest = &b[pos];
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
     const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Float) - 1;
     *dest++ = *src--;
     *dest++ = *src--;
@@ -1032,7 +1032,7 @@ IceInternal::BasicStream::read(Float& v)
     }
     const Byte* src = &(*i);
     i += sizeof(Float);
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
     Byte* dest = reinterpret_cast<Byte*>(&v) + sizeof(Float) - 1;
     *dest-- = *src++;
     *dest-- = *src++;
@@ -1056,7 +1056,7 @@ IceInternal::BasicStream::write(const vector<Float>& v)
     {
 	Container::size_type pos = b.size();
 	resize(pos + sz * sizeof(Float));
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
 	const Byte* src = reinterpret_cast<const Byte*>(&v[0]) + sizeof(Float) - 1;
 	Byte* dest = &(*(b.begin() + pos));
 	for(int j = 0 ; j < sz ; ++j)
@@ -1084,7 +1084,7 @@ IceInternal::BasicStream::read(vector<Float>& v)
 	Container::iterator begin = i;
 	i += sz * static_cast<int>(sizeof(Float));
 	v.resize(sz);
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
 	const Byte* src = &(*begin);
 	Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Float) - 1;
 	for(int j = 0 ; j < sz ; ++j)
@@ -1111,7 +1111,7 @@ IceInternal::BasicStream::write(Double v)
     Container::size_type pos = b.size();
     resize(pos + sizeof(Double));
     Byte* dest = &b[pos];
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
     const Byte* src = reinterpret_cast<const Byte*>(&v) + sizeof(Double) - 1;
     *dest++ = *src--;
     *dest++ = *src--;
@@ -1143,7 +1143,7 @@ IceInternal::BasicStream::read(Double& v)
     }
     const Byte* src = &(*i);
     i += sizeof(Double);
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
     Byte* dest = reinterpret_cast<Byte*>(&v) + sizeof(Double) - 1;
     *dest-- = *src++;
     *dest-- = *src++;
@@ -1175,7 +1175,7 @@ IceInternal::BasicStream::write(const vector<Double>& v)
     {
 	Container::size_type pos = b.size();
 	resize(pos + sz * sizeof(Double));
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
 	const Byte* src = reinterpret_cast<const Byte*>(&v[0]) + sizeof(Double) - 1;
 	Byte* dest = &(*(b.begin() + pos));
 	for(int j = 0 ; j < sz ; ++j)
@@ -1207,7 +1207,7 @@ IceInternal::BasicStream::read(vector<Double>& v)
 	Container::iterator begin = i;
 	i += sz * static_cast<int>(sizeof(Double));
 	v.resize(sz);
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
 	const Byte* src = &(*begin);
 	Byte* dest = reinterpret_cast<Byte*>(&v[0]) + sizeof(Double) - 1;
 	for(int j = 0 ; j < sz ; ++j)
diff --git a/cppe/src/IceE/Buffer.cpp b/cppe/src/IceE/Buffer.cpp
index f36d87dc2d3..12964bde6d7 100644
--- a/cppe/src/IceE/Buffer.cpp
+++ b/cppe/src/IceE/Buffer.cpp
@@ -17,7 +17,7 @@ using namespace IceInternal;
 void
 IceInternal::Buffer::swap(Buffer& other)
 {
-#ifdef ICEE_SMALL_MESSAGE_BUFFER_OPTIMIZATION
+#ifdef ICE_SMALL_MESSAGE_BUFFER_OPTIMIZATION
     Container::difference_type pos = i - b.begin();
     Container::difference_type otherPos = other.i - other.b.begin();
     b.swap(other.b);
@@ -32,7 +32,7 @@ IceInternal::Buffer::swap(Buffer& other)
 void
 IceInternal::Buffer::Container::swap(Container& other)
 {
-#ifdef ICEE_SMALL_MESSAGE_BUFFER_OPTIMIZATION
+#ifdef ICE_SMALL_MESSAGE_BUFFER_OPTIMIZATION
     if(_buf == _fixed)
     {
 	if(other._buf == other._fixed)
@@ -84,7 +84,7 @@ IceInternal::Buffer::Container::resize(size_type n)
 	    _capacity = std::max<size_type>(n, 2 * _capacity);
 	    _capacity = std::max<size_type>(static_cast<size_type>(240), _capacity);
 	    
-#ifdef ICEE_SMALL_MESSAGE_BUFFER_OPTIMIZATION
+#ifdef ICE_SMALL_MESSAGE_BUFFER_OPTIMIZATION
 	    if(_buf != _fixed)
 	    {
 		_buf = reinterpret_cast<pointer>(realloc(_buf, _capacity));
diff --git a/cppe/src/IceE/Communicator.cpp b/cppe/src/IceE/Communicator.cpp
index 6101ab82c61..ffcfe8535a1 100755
--- a/cppe/src/IceE/Communicator.cpp
+++ b/cppe/src/IceE/Communicator.cpp
@@ -15,7 +15,7 @@
 #include <IceE/LoggerUtil.h>
 #include <IceE/LocalException.h>
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 #   include <IceE/ObjectAdapterFactory.h>
 #endif
 
@@ -57,7 +57,7 @@ Ice::Communicator::destroy()
     }
 }
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 
 void
 Ice::Communicator::shutdown()
@@ -126,7 +126,7 @@ Ice::Communicator::proxyToString(const ObjectPrx& proxy) const
     return _instance->proxyFactory()->proxyToString(proxy);
 }
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 
 ObjectAdapterPtr
 Ice::Communicator::createObjectAdapter(const string& name)
@@ -205,7 +205,7 @@ Ice::Communicator::setLogger(const LoggerPtr& logger)
     _instance->logger(logger);
 }
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 
 RouterPrx
 Ice::Communicator::getDefaultRouter() const
@@ -231,7 +231,7 @@ Ice::Communicator::setDefaultRouter(const RouterPrx& router)
 
 #endif
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 
 LocatorPrx
 Ice::Communicator::getDefaultLocator() const
@@ -257,7 +257,7 @@ Ice::Communicator::setDefaultLocator(const LocatorPrx& locator)
 
 #endif
 
-#ifdef ICEE_HAS_BATCH
+#ifdef ICE_HAS_BATCH
 
 void
 Ice::Communicator::flushBatchRequests()
diff --git a/cppe/src/IceE/Connection.cpp b/cppe/src/IceE/Connection.cpp
index dd1e9cbd7b4..6536ead4b05 100755
--- a/cppe/src/IceE/Connection.cpp
+++ b/cppe/src/IceE/Connection.cpp
@@ -22,7 +22,7 @@
 #include <IceE/ProxyFactory.h> // For createProxy().
 #include <IceE/BasicStream.h>
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 #   include <IceE/ObjectAdapter.h>
 #   include <IceE/Incoming.h>
 #endif
@@ -69,7 +69,7 @@ Ice::Connection::waitForValidation()
     }
 }
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 void
 Ice::Connection::activate()
 {
@@ -92,7 +92,7 @@ Ice::Connection::destroy(DestructionReason reason)
 
     switch(reason)
     {
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 	case ObjectAdapterDeactivated:
 	{
 	    setState(StateClosing, ObjectAdapterDeactivatedException(__FILE__, __LINE__));
@@ -171,7 +171,7 @@ Ice::Connection::isFinished() const
     return true;
 }
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 
 void
 Ice::Connection::waitUntilHolding() const
@@ -304,7 +304,7 @@ Ice::Connection::sendRequest(BasicStream* os, Outgoing* out)
 	    // Fill in the request ID.
 	    //
 	    const Byte* p = reinterpret_cast<const Byte*>(&requestId);
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
 	    reverse_copy(p, p + sizeof(Int), os->b.begin() + headerSize);
 #else
 	    copy(p, p + sizeof(Int), os->b.begin() + headerSize);
@@ -329,7 +329,7 @@ Ice::Connection::sendRequest(BasicStream* os, Outgoing* out)
 	
 	Int sz = static_cast<Int>(os->b.size());
 	const Byte* p = reinterpret_cast<const Byte*>(&sz);
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
 	reverse_copy(p, p + sizeof(Int), os->b.begin() + 10);
 #else
 	copy(p, p + sizeof(Int), os->b.begin() + 10);
@@ -387,7 +387,7 @@ Ice::Connection::sendRequest(BasicStream* os, Outgoing* out)
     }
 }
 
-#ifdef ICEE_HAS_BATCH
+#ifdef ICE_HAS_BATCH
 
 void
 Ice::Connection::prepareBatchRequest(BasicStream* os)
@@ -522,7 +522,7 @@ Ice::Connection::flushBatchRequests()
 	// Fill in the number of requests in the batch.
 	//
 	const Byte* p = reinterpret_cast<const Byte*>(&_batchRequestNum);
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
 	reverse_copy(p, p + sizeof(Int), _batchStream.b.begin() + headerSize);
 #else
 	copy(p, p + sizeof(Int), _batchStream.b.begin() + headerSize);
@@ -530,7 +530,7 @@ Ice::Connection::flushBatchRequests()
 	
 	Int sz = static_cast<Int>(_batchStream.b.size());
 	p = reinterpret_cast<const Byte*>(&sz);
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
 	reverse_copy(p, p + sizeof(Int), _batchStream.b.begin() + 10);
 #else
 	copy(p, p + sizeof(Int), _batchStream.b.begin() + 10);
@@ -572,7 +572,7 @@ Ice::Connection::flushBatchRequests()
 
 #endif
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 
 void
 Ice::Connection::sendResponse(BasicStream* os)
@@ -589,7 +589,7 @@ Ice::Connection::sendResponse(BasicStream* os)
 
 	Int sz = static_cast<Int>(os->b.size());
 	const Byte* p = reinterpret_cast<const Byte*>(&sz);
-#ifdef ICEE_BIG_ENDIAN
+#ifdef ICE_BIG_ENDIAN
 	reverse_copy(p, p + sizeof(Int), os->b.begin() + 10);
 #else
 	copy(p, p + sizeof(Int), os->b.begin() + 10);
@@ -665,7 +665,7 @@ Ice::Connection::endpoint() const
     return _endpoint; // No mutex protection necessary, _endpoint is immutable.
 }
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 
 void
 Ice::Connection::setAdapter(const ObjectAdapterPtr& adapter)
@@ -758,7 +758,7 @@ Ice::Connection::toString() const
     return _desc; // No mutex lock, _desc is immutable.
 }
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 Ice::Connection::Connection(const InstancePtr& instance,
 			    const TransceiverPtr& transceiver,
 			    const EndpointPtr& endpoint,
@@ -774,19 +774,19 @@ Ice::Connection::Connection(const InstancePtr& instance,
     _desc(transceiver->toString()),
     _type(transceiver->type()),
     _endpoint(endpoint),
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     _adapter(adapter),
 #endif
     _logger(_instance->logger()), // Cached for better performance.
     _traceLevels(_instance->traceLevels()), // Cached for better performance.
     _warn(_instance->properties()->getPropertyAsInt("Ice.Warn.Connections") > 0),
     _requestHdr(headerSize + sizeof(Int), 0),
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     _replyHdr(headerSize, 0),
 #endif
     _nextRequestId(1),
     _requestsHint(_requests.end()),
-#ifdef ICEE_HAS_BATCH
+#ifdef ICE_HAS_BATCH
     _requestBatchHdr(headerSize + sizeof(Int), 0),
     _batchStream(_instance.get()),
     _batchStreamInUse(false),
@@ -808,7 +808,7 @@ Ice::Connection::Connection(const InstancePtr& instance,
     requestHdr[8] = requestMsg;
     requestHdr[9] = 0;
 
-#ifdef ICEE_HAS_BATCH
+#ifdef ICE_HAS_BATCH
     vector<Byte>& requestBatchHdr = const_cast<vector<Byte>&>(_requestBatchHdr);
     requestBatchHdr[0] = magic[0];
     requestBatchHdr[1] = magic[1];
@@ -822,7 +822,7 @@ Ice::Connection::Connection(const InstancePtr& instance,
     requestBatchHdr[9] = 0;
 #endif
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     vector<Byte>& replyHdr = const_cast<vector<Byte>&>(_replyHdr);
     replyHdr[0] = magic[0];
     replyHdr[1] = magic[1];
@@ -886,7 +886,7 @@ Ice::Connection::~Connection()
 void
 Ice::Connection::validate()
 {
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     bool active;
 
     {
@@ -917,7 +917,7 @@ Ice::Connection::validate()
     	    timeout = _endpoint->timeout();
         }
         
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
         if(active)
         {
     	    BasicStream os(_instance.get());
@@ -1015,7 +1015,7 @@ Ice::Connection::validate()
         _exception->ice_throw();
     }
 
-#ifdef ICEE_PURE_CLIENT
+#ifdef ICE_PURE_CLIENT
     {
 	IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
 	
@@ -1073,7 +1073,7 @@ Ice::Connection::setState(State state, const LocalException& ex)
 		     dynamic_cast<const ForcedCloseConnectionException*>(_exception.get()) ||
 		     dynamic_cast<const ConnectionTimeoutException*>(_exception.get()) ||
 		     dynamic_cast<const CommunicatorDestroyedException*>(_exception.get()) ||
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 		     dynamic_cast<const ObjectAdapterDeactivatedException*>(_exception.get()) ||
 #endif
 		     (dynamic_cast<const ConnectionLostException*>(_exception.get()) && _state == StateClosing)))
@@ -1115,7 +1115,7 @@ Ice::Connection::setState(State state)
             // Can only switch from holding or not validated to
             // active.
 	    //
-#ifdef ICEE_PURE_CLIENT
+#ifdef ICE_PURE_CLIENT
 	    if(_state != StateNotValidated)
 	    {
 		return;
@@ -1129,7 +1129,7 @@ Ice::Connection::setState(State state)
 	    break;
 	}
 	
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 	case StateHolding:
 	{
 	    //
@@ -1228,7 +1228,7 @@ Ice::Connection::initiateShutdown() const
 
 void
 Ice::Connection::parseMessage(BasicStream& stream, Int& requestId
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 			      ,Int& invokeNum, ServantManagerPtr& servantManager, ObjectAdapterPtr& adapter
 #endif
 )
@@ -1266,7 +1266,7 @@ Ice::Connection::parseMessage(BasicStream& stream, Int& requestId
 		break;
 	    }
 	
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 	    case requestMsg:
 	    {
 		if(_state == StateClosing)
@@ -1383,7 +1383,7 @@ Ice::Connection::parseMessage(BasicStream& stream, Int& requestId
     }
 }
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 void
 Ice::Connection::invokeAll(BasicStream& stream, Int invokeNum, Int requestId,
 			    const ServantManagerPtr& servantManager, const ObjectAdapterPtr& adapter)
@@ -1599,7 +1599,7 @@ Ice::Connection::run()
 	}
 
 	Int requestId = 0;
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 	Int invokeNum = 0;
 	ServantManagerPtr servantManager;
 	ObjectAdapterPtr adapter;
@@ -1612,7 +1612,7 @@ Ice::Connection::run()
 	{
 	    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 	    while(_state == StateHolding)
 	    {
 		wait();
@@ -1620,7 +1620,7 @@ Ice::Connection::run()
 #endif
 	    if(_state != StateClosed)
 	    {
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 		parseMessage(stream, requestId, invokeNum, servantManager, adapter);
 #else
 		parseMessage(stream, requestId);
@@ -1671,7 +1671,7 @@ Ice::Connection::run()
 	// messages) must be done outside the thread synchronization,
 	// so that nested calls are possible.
 	//
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 	invokeAll(stream, invokeNum, requestId, servantManager, adapter);
 #endif
 	for(map<Int, Outgoing*>::iterator p = requests.begin(); p != requests.end(); ++p)
diff --git a/cppe/src/IceE/Connector.h b/cppe/src/IceE/Connector.h
index 87ab81771be..adb21b0197f 100755
--- a/cppe/src/IceE/Connector.h
+++ b/cppe/src/IceE/Connector.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_CONNECTOR_H
-#define ICEE_CONNECTOR_H
+#ifndef ICE_CONNECTOR_H
+#define ICE_CONNECTOR_H
 
 #include <IceE/ConnectorF.h>
 #include <IceE/TransceiverF.h>
@@ -28,7 +28,7 @@ namespace IceInternal
 
 class Endpoint;
 
-class ICEE_API Connector : public ::IceUtil::Shared
+class ICE_API Connector : public ::IceUtil::Shared
 {
 public:
     
diff --git a/cppe/src/IceE/ConnectorF.h b/cppe/src/IceE/ConnectorF.h
index eb3a22e718c..83646738af7 100644
--- a/cppe/src/IceE/ConnectorF.h
+++ b/cppe/src/IceE/ConnectorF.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_CONNECTOR_F_H
-#define ICEE_CONNECTOR_F_H
+#ifndef ICE_CONNECTOR_F_H
+#define ICE_CONNECTOR_F_H
 
 #include <IceE/Handle.h>
 
@@ -16,8 +16,8 @@ namespace IceInternal
 {
 
 class Connector;
-ICEE_API void incRef(Connector*);
-ICEE_API void decRef(Connector*);
+ICE_API void incRef(Connector*);
+ICE_API void decRef(Connector*);
 typedef Handle<Connector> ConnectorPtr;
 
 }
diff --git a/cppe/src/IceE/DefaultsAndOverrides.cpp b/cppe/src/IceE/DefaultsAndOverrides.cpp
index 9364971bec8..ee6df67c5da 100644
--- a/cppe/src/IceE/DefaultsAndOverrides.cpp
+++ b/cppe/src/IceE/DefaultsAndOverrides.cpp
@@ -30,7 +30,7 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro
 	const_cast<string&>(defaultHost) = getLocalHost(true);
     }
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     const_cast<string&>(defaultRouter) = properties->getProperty("Ice.Default.Router");
 #endif
 
@@ -50,7 +50,7 @@ IceInternal::DefaultsAndOverrides::DefaultsAndOverrides(const PropertiesPtr& pro
 	const_cast<Int&>(overrideConnectTimeoutValue) = properties->getPropertyAsInt("Ice.Override.ConnectTimeout");
     }
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     const_cast<string&>(defaultLocator) = properties->getProperty("Ice.Default.Locator");
 #endif
 }
diff --git a/cppe/src/IceE/DefaultsAndOverrides.h b/cppe/src/IceE/DefaultsAndOverrides.h
index 853cfdb96e2..98a86e8bb3f 100644
--- a/cppe/src/IceE/DefaultsAndOverrides.h
+++ b/cppe/src/IceE/DefaultsAndOverrides.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_DEFAULTS_AND_OVERRIDES_H
-#define ICEE_DEFAULTS_AND_OVERRIDES_H
+#ifndef ICE_DEFAULTS_AND_OVERRIDES_H
+#define ICE_DEFAULTS_AND_OVERRIDES_H
 
 #include <IceE/DefaultsAndOverridesF.h>
 #include <IceE/PropertiesF.h>
@@ -24,10 +24,10 @@ public:
     DefaultsAndOverrides(const ::Ice::PropertiesPtr&);
 
     std::string defaultHost;
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     std::string defaultRouter;
 #endif
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     std::string defaultLocator;
 #endif
 
diff --git a/cppe/src/IceE/DefaultsAndOverridesF.h b/cppe/src/IceE/DefaultsAndOverridesF.h
index cdac8655c5f..05f725f4712 100644
--- a/cppe/src/IceE/DefaultsAndOverridesF.h
+++ b/cppe/src/IceE/DefaultsAndOverridesF.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_DEFAULTS_AND_OVERRIDES_F_H
-#define ICEE_DEFAULTS_AND_OVERRIDES_F_H
+#ifndef ICE_DEFAULTS_AND_OVERRIDES_F_H
+#define ICE_DEFAULTS_AND_OVERRIDES_F_H
 
 #include <IceE/Handle.h>
 
diff --git a/cppe/src/IceE/Endpoint.h b/cppe/src/IceE/Endpoint.h
index 6615ba9364a..354fe392de1 100644
--- a/cppe/src/IceE/Endpoint.h
+++ b/cppe/src/IceE/Endpoint.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_ENDPOINT_H
-#define ICEE_ENDPOINT_H
+#ifndef ICE_ENDPOINT_H
+#define ICE_ENDPOINT_H
 
 #include <IceE/EndpointF.h>
 #include <IceE/ConnectorF.h>
@@ -16,7 +16,7 @@
 #include <IceE/InstanceF.h>
 #include <IceE/LoggerF.h>
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 #   include <IceE/AcceptorF.h>
 #endif
 
@@ -27,7 +27,7 @@ namespace IceInternal
 
 class BasicStream;
 
-class ICEE_API Endpoint : public IceUtil::Shared
+class ICE_API Endpoint : public IceUtil::Shared
 {
 public:
 
@@ -77,7 +77,7 @@ public:
     // from this endpoint, for example, if a dynamic port number is
     // assigned.
     //
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     virtual AcceptorPtr acceptor(EndpointPtr&) const = 0;
 #endif
 
@@ -86,7 +86,7 @@ public:
     // Transceiver or Acceptor.
     //
     virtual bool equivalent(const TransceiverPtr&) const = 0;
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     virtual bool equivalent(const AcceptorPtr&) const = 0;
 #endif
 
diff --git a/cppe/src/IceE/EndpointFactory.h b/cppe/src/IceE/EndpointFactory.h
index 3df7cf884f7..89579ca61af 100644
--- a/cppe/src/IceE/EndpointFactory.h
+++ b/cppe/src/IceE/EndpointFactory.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_ENDPOINT_FACTORY_H
-#define ICEE_ENDPOINT_FACTORY_H
+#ifndef ICE_ENDPOINT_FACTORY_H
+#define ICE_ENDPOINT_FACTORY_H
 
 #include <IceE/EndpointFactoryF.h>
 #include <IceE/EndpointF.h>
@@ -20,7 +20,7 @@ namespace IceInternal
 
 class BasicStream;
 
-class ICEE_API EndpointFactory : public ::IceUtil::Shared
+class ICE_API EndpointFactory : public ::IceUtil::Shared
 {
 public:
 
diff --git a/cppe/src/IceE/EndpointFactoryF.h b/cppe/src/IceE/EndpointFactoryF.h
index e27bdfd1e60..0143fc0164e 100644
--- a/cppe/src/IceE/EndpointFactoryF.h
+++ b/cppe/src/IceE/EndpointFactoryF.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_ENDPOINT_FACTORY_F_H
-#define ICEE_ENDPOINT_FACTORY_F_H
+#ifndef ICE_ENDPOINT_FACTORY_F_H
+#define ICE_ENDPOINT_FACTORY_F_H
 
 #include <IceE/Handle.h>
 
@@ -16,8 +16,8 @@ namespace IceInternal
 {
 
 class EndpointFactory;
-ICEE_API void incRef(EndpointFactory*);
-ICEE_API void decRef(EndpointFactory*);
+ICE_API void incRef(EndpointFactory*);
+ICE_API void decRef(EndpointFactory*);
 typedef Handle<EndpointFactory> EndpointFactoryPtr;
 
 }
diff --git a/cppe/src/IceE/ExceptionBase.cpp b/cppe/src/IceE/ExceptionBase.cpp
index 598fc5225c4..f924aca51ac 100755
--- a/cppe/src/IceE/ExceptionBase.cpp
+++ b/cppe/src/IceE/ExceptionBase.cpp
@@ -15,7 +15,7 @@ using namespace std;
 namespace IceUtil
 {
 
-bool ICEE_API nullHandleAbort = false;
+bool ICE_API nullHandleAbort = false;
 
 };
 
diff --git a/cppe/src/IceE/FactoryTableDef.cpp b/cppe/src/IceE/FactoryTableDef.cpp
index 25c94f8745f..5c84b901c5b 100644
--- a/cppe/src/IceE/FactoryTableDef.cpp
+++ b/cppe/src/IceE/FactoryTableDef.cpp
@@ -20,7 +20,7 @@ namespace IceInternal
 FactoryTableWrapper factoryTableWrapper;	// Single global instance of the wrapper object that
 						// initializes factoryTable.
 
-ICEE_API FactoryTableDef* factoryTable;		// Single global instance of the factory table for
+ICE_API FactoryTableDef* factoryTable;		// Single global instance of the factory table for
 						// non-local exceptions and non-abstract classes
 }
 
@@ -140,5 +140,5 @@ IceInternal::FactoryTableWrapper::finalize()
     }
 }
 
-IceUtil::StaticMutex IceInternal::FactoryTableWrapper::_m = ICEE_STATIC_MUTEX_INITIALIZER;
+IceUtil::StaticMutex IceInternal::FactoryTableWrapper::_m = ICE_STATIC_MUTEX_INITIALIZER;
 int IceInternal::FactoryTableWrapper::_initCount = 0;	// Initialization count
diff --git a/cppe/src/IceE/IncomingConnectionFactory.h b/cppe/src/IceE/IncomingConnectionFactory.h
index 717af507918..7a302502f26 100755
--- a/cppe/src/IceE/IncomingConnectionFactory.h
+++ b/cppe/src/IceE/IncomingConnectionFactory.h
@@ -8,8 +8,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_INCOMING_CONNECTION_FACTORY_H
-#define ICEE_INCOMING_CONNECTION_FACTORY_H
+#ifndef ICE_INCOMING_CONNECTION_FACTORY_H
+#define ICE_INCOMING_CONNECTION_FACTORY_H
 
 #include <IceE/IncomingConnectionFactoryF.h>
 #include <IceE/EndpointF.h>
@@ -42,7 +42,7 @@ public:
     EndpointPtr endpoint() const;
     bool equivalent(const EndpointPtr&) const;
     std::list<Ice::ConnectionPtr> connections() const;
-#ifdef ICEE_HAS_BATCH
+#ifdef ICE_HAS_BATCH
     void flushBatchRequests();
 #endif
 
diff --git a/cppe/src/IceE/Initialize.cpp b/cppe/src/IceE/Initialize.cpp
index 62f040a9e49..269a592a40d 100644
--- a/cppe/src/IceE/Initialize.cpp
+++ b/cppe/src/IceE/Initialize.cpp
@@ -132,11 +132,11 @@ Ice::initialize(int& argc, char* argv[], Int version)
 CommunicatorPtr
 Ice::initializeWithProperties(int& argc, char* argv[], const PropertiesPtr& properties, Int version)
 {
-#ifndef ICEE_IGNORE_VERSION
+#ifndef ICE_IGNORE_VERSION
     //
     // Major and minor version numbers must match.
     //
-    if(ICEE_INT_VERSION / 100 != version / 100)
+    if(ICE_INT_VERSION / 100 != version / 100)
     {
 	throw VersionMismatchException(__FILE__, __LINE__);
     }
@@ -144,7 +144,7 @@ Ice::initializeWithProperties(int& argc, char* argv[], const PropertiesPtr& prop
     // The caller's patch level cannot be greater than library's patch level. (Patch level changes are
     // backward-compatible, but not forward-compatible.)
     //
-    if(version % 100 > ICEE_INT_VERSION % 100)
+    if(version % 100 > ICE_INT_VERSION % 100)
     {
 	throw VersionMismatchException(__FILE__, __LINE__);
     }
diff --git a/cppe/src/IceE/Instance.cpp b/cppe/src/IceE/Instance.cpp
index 3fdb8b17598..bf3b203f00c 100644
--- a/cppe/src/IceE/Instance.cpp
+++ b/cppe/src/IceE/Instance.cpp
@@ -10,11 +10,11 @@
 #include <IceE/Instance.h>
 #include <IceE/TraceLevels.h>
 #include <IceE/DefaultsAndOverrides.h>
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 #    include <IceE/RouterInfo.h>
 #    include <IceE/Router.h>
 #endif
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 #    include <IceE/LocatorInfo.h>
 #    include <IceE/Locator.h>
 #endif
@@ -25,7 +25,7 @@
 #include <IceE/Properties.h>
 #include <IceE/LoggerI.h>
 #include <IceE/EndpointFactory.h>
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 #    include <IceE/ObjectAdapterFactory.h>
 #endif
 
@@ -43,7 +43,7 @@ using namespace std;
 using namespace Ice;
 using namespace IceInternal;
 
-static IceUtil::StaticMutex staticMutex = ICEE_STATIC_MUTEX_INITIALIZER;
+static IceUtil::StaticMutex staticMutex = ICE_STATIC_MUTEX_INITIALIZER;
 static bool oneOffDone = false;
 static int instanceCount = 0;
 static bool printProcessIdDone = false;
@@ -51,7 +51,7 @@ static bool printProcessIdDone = false;
 namespace IceUtil
 {
 
-extern bool ICEE_API nullHandleAbort;
+extern bool ICE_API nullHandleAbort;
 
 }
 
@@ -110,7 +110,7 @@ IceInternal::Instance::defaultsAndOverrides() const
     return _defaultsAndOverrides;
 }
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 
 RouterManagerPtr
 IceInternal::Instance::routerManager() const
@@ -127,7 +127,7 @@ IceInternal::Instance::routerManager() const
 
 #endif
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 
 LocatorManagerPtr
 IceInternal::Instance::locatorManager() const
@@ -183,7 +183,7 @@ IceInternal::Instance::outgoingConnectionFactory() const
     return _outgoingConnectionFactory;
 }
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 ObjectAdapterFactoryPtr
 IceInternal::Instance::objectAdapterFactory() const
 {
@@ -225,13 +225,13 @@ IceInternal::Instance::messageSizeMax() const
     return _messageSizeMax;
 }
 
-#ifdef ICEE_HAS_BATCH
+#ifdef ICE_HAS_BATCH
 void
 IceInternal::Instance::flushBatchRequests()
 {
 
     OutgoingConnectionFactoryPtr connectionFactory;
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     ObjectAdapterFactoryPtr adapterFactory;
 #endif
 
@@ -244,13 +244,13 @@ IceInternal::Instance::flushBatchRequests()
 	}
 
 	connectionFactory = _outgoingConnectionFactory;
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 	adapterFactory = _objectAdapterFactory;
 #endif
     }
 
     connectionFactory->flushBatchRequests();
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     adapterFactory->flushBatchRequests();
 #endif
 
@@ -430,11 +430,11 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope
 	    const_cast<size_t&>(_threadPerConnectionStackSize) = static_cast<size_t>(stackSize);
 	}
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 	_routerManager = new RouterManager;
 #endif
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 	_locatorManager = new LocatorManager;
 #endif
 
@@ -446,7 +446,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope
 
 	_outgoingConnectionFactory = new OutgoingConnectionFactory(this);
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 	_objectAdapterFactory = new ObjectAdapterFactory(this, communicator);
 #endif
 
@@ -470,13 +470,13 @@ IceInternal::Instance::~Instance()
     assert(!_referenceFactory);
     assert(!_proxyFactory);
     assert(!_outgoingConnectionFactory);
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     assert(!_objectAdapterFactory);
 #endif
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     assert(!_routerManager);
 #endif
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     assert(!_locatorManager);
 #endif
     assert(!_endpointFactory);
@@ -506,7 +506,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[])
     // initialization before the plug-in initialization!!! The proxies
     // might depend on endpoint factories to be installed by plug-ins.
     //
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     if(!_defaultsAndOverrides->defaultRouter.empty())
     {
 	_referenceFactory->setDefaultRouter(
@@ -514,7 +514,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[])
     }
 #endif
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     if(!_defaultsAndOverrides->defaultLocator.empty())
     {
 	_referenceFactory->setDefaultLocator(
@@ -558,7 +558,7 @@ IceInternal::Instance::destroy()
 {
     assert(!_destroyed);
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     if(_objectAdapterFactory)
     {
         _objectAdapterFactory->shutdown();	
@@ -589,7 +589,7 @@ IceInternal::Instance::destroy()
     {
 	IceUtil::RecMutex::Lock sync(*this);
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 	_objectAdapterFactory = 0;
 #endif
 	_outgoingConnectionFactory = 0;
@@ -604,7 +604,7 @@ IceInternal::Instance::destroy()
 	// _proxyFactory->destroy();
 	_proxyFactory = 0;
 	
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 	if(_routerManager)
 	{
 	    _routerManager->destroy();
@@ -612,7 +612,7 @@ IceInternal::Instance::destroy()
 	}
 #endif
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 	if(_locatorManager)
 	{
 	    _locatorManager->destroy();
diff --git a/cppe/src/IceE/Instance.h b/cppe/src/IceE/Instance.h
index 7826e8d6819..d3bfc6f9805 100644
--- a/cppe/src/IceE/Instance.h
+++ b/cppe/src/IceE/Instance.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_INSTANCE_H
-#define ICEE_INSTANCE_H
+#ifndef ICE_INSTANCE_H
+#define ICE_INSTANCE_H
 
 #include <IceE/InstanceF.h>
 #include <IceE/CommunicatorF.h>
@@ -22,7 +22,7 @@
 #include <IceE/ProxyFactoryF.h>
 #include <IceE/OutgoingConnectionFactoryF.h>
 #include <IceE/EndpointFactoryF.h>
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 #   include <IceE/ObjectAdapterFactoryF.h>
 #endif
 #include <IceE/Shared.h>
@@ -41,10 +41,10 @@ public:
     void logger(const Ice::LoggerPtr&);
     TraceLevelsPtr traceLevels() const;
     DefaultsAndOverridesPtr defaultsAndOverrides() const;
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     RouterManagerPtr routerManager() const;
 #endif
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     LocatorManagerPtr locatorManager() const;
 #endif
     ReferenceFactoryPtr referenceFactory() const;
@@ -53,14 +53,14 @@ public:
     EndpointFactoryPtr endpointFactory() const;
     size_t messageSizeMax() const;
     Ice::Int connectionIdleTime() const;
-#ifdef ICEE_HAS_BATCH
+#ifdef ICE_HAS_BATCH
     void flushBatchRequests();
 #endif
     void setDefaultContext(const ::Ice::Context&);
     const ::Ice::Context& getDefaultContext() const;
     size_t threadPerConnectionStackSize() const;
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     ObjectAdapterFactoryPtr objectAdapterFactory() const;
 #endif
 
@@ -81,10 +81,10 @@ private:
     const DefaultsAndOverridesPtr _defaultsAndOverrides; // Immutable, not reset by destroy().
     const size_t _messageSizeMax; // Immutable, not reset by destroy().
     const size_t _threadPerConnectionStackSize;
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     RouterManagerPtr _routerManager;
 #endif
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     LocatorManagerPtr _locatorManager;
 #endif
     ReferenceFactoryPtr _referenceFactory;
@@ -93,7 +93,7 @@ private:
     EndpointFactoryPtr _endpointFactory;
     Ice::Context _defaultContext;
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     ObjectAdapterFactoryPtr _objectAdapterFactory;
 #endif
 };
diff --git a/cppe/src/IceE/LocalException.cpp b/cppe/src/IceE/LocalException.cpp
index 236ca498ca3..63f047b867d 100755
--- a/cppe/src/IceE/LocalException.cpp
+++ b/cppe/src/IceE/LocalException.cpp
@@ -342,7 +342,7 @@ Ice::CommunicatorDestroyedException::ice_throw() const
     throw *this;
 }
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 
 Ice::ObjectAdapterDeactivatedException::ObjectAdapterDeactivatedException(const char* __file, int __line) :
 #if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
@@ -434,7 +434,7 @@ Ice::ObjectAdapterIdInUseException::ice_throw() const
 string
 Ice::ObjectAdapterIdInUseException::toString() const
 {
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     string out = Exception::toString();
     out += ":\nobject adapter with id `";
     out += id; 
@@ -445,7 +445,7 @@ Ice::ObjectAdapterIdInUseException::toString() const
 #endif
 }
 
-#endif // ICEE_PURE_CLIENT
+#endif // ICE_PURE_CLIENT
 
 Ice::NoEndpointException::NoEndpointException(const char* __file, int __line) :
 #if defined(_MSC_VER) && (_MSC_VER < 1300) // VC++ 6 compiler bug
diff --git a/cppe/src/IceE/LocatorInfo.cpp b/cppe/src/IceE/LocatorInfo.cpp
index 3539fc9e7af..5d86bf1d01b 100644
--- a/cppe/src/IceE/LocatorInfo.cpp
+++ b/cppe/src/IceE/LocatorInfo.cpp
@@ -9,7 +9,7 @@
 
 #include <IceE/Config.h>
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 
 #include <IceE/LocatorInfo.h>
 #include <IceE/Locator.h>
diff --git a/cppe/src/IceE/LocatorInfo.h b/cppe/src/IceE/LocatorInfo.h
index b5c94c66991..32706929b9d 100644
--- a/cppe/src/IceE/LocatorInfo.h
+++ b/cppe/src/IceE/LocatorInfo.h
@@ -7,12 +7,12 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_LOCATOR_INFO_H
-#define ICEE_LOCATOR_INFO_H
+#ifndef ICE_LOCATOR_INFO_H
+#define ICE_LOCATOR_INFO_H
 
 #include <IceE/Config.h>
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 
 #include <IceE/LocatorInfoF.h>
 #include <IceE/LocatorF.h>
diff --git a/cppe/src/IceE/LoggerI.h b/cppe/src/IceE/LoggerI.h
index 575706ef4e2..f4c3d49188f 100644
--- a/cppe/src/IceE/LoggerI.h
+++ b/cppe/src/IceE/LoggerI.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_LOGGER_I_H
-#define ICEE_LOGGER_I_H
+#ifndef ICE_LOGGER_I_H
+#define ICE_LOGGER_I_H
 
 #include <IceE/Logger.h>
 #include <IceE/Mutex.h>
diff --git a/cppe/src/IceE/Makefile b/cppe/src/IceE/Makefile
index 64ab51cd56d..b4154981058 100644
--- a/cppe/src/IceE/Makefile
+++ b/cppe/src/IceE/Makefile
@@ -117,8 +117,8 @@ OBJS		:= 	$(OBJS) $(AOBJ)
 CFLAGS		:= 	$(CFLAGS) -fomit-frame-pointer
 endif
 
-CPPFLAGS	:= -I.. $(CPPFLAGS) -DICEE_API_EXPORTS 
-SLICE2CPPEFLAGS	:= --ice --include-dir IceE --dll-export ICEE_API $(SLICE2CPPEFLAGS)
+CPPFLAGS	:= -I.. $(CPPFLAGS) -DICE_API_EXPORTS 
+SLICE2CPPEFLAGS	:= --ice --include-dir IceE --dll-export ICE_API $(SLICE2CPPEFLAGS)
 
 LINKWITH        := $(ICE_OS_LIBS)
 
diff --git a/cppe/src/IceE/Network.cpp b/cppe/src/IceE/Network.cpp
index 68815363cc0..4d443c7b92e 100644
--- a/cppe/src/IceE/Network.cpp
+++ b/cppe/src/IceE/Network.cpp
@@ -858,7 +858,7 @@ IceInternal::addrToString(const struct sockaddr_in& addr)
     return s;
 }
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 
 bool
 IceInternal::acceptInterrupted()
diff --git a/cppe/src/IceE/Network.h b/cppe/src/IceE/Network.h
index efe8320ac72..6a185764777 100644
--- a/cppe/src/IceE/Network.h
+++ b/cppe/src/IceE/Network.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_NETWORK_H
-#define ICEE_NETWORK_H
+#ifndef ICE_NETWORK_H
+#define ICE_NETWORK_H
 
 #ifdef __hpux
 #   define _XOPEN_SOURCE_EXTENDED
diff --git a/cppe/src/IceE/ObjectAdapter.cpp b/cppe/src/IceE/ObjectAdapter.cpp
index 93068218ff5..e438a24ace1 100644
--- a/cppe/src/IceE/ObjectAdapter.cpp
+++ b/cppe/src/IceE/ObjectAdapter.cpp
@@ -19,11 +19,11 @@
 #include <IceE/LocalException.h>
 #include <IceE/Properties.h>
 #include <IceE/Functional.h>
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 #    include <IceE/LocatorInfo.h>
 #    include <IceE/Locator.h>
 #endif
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 #    include <IceE/RouterInfo.h>
 #    include <IceE/Router.h>
 #    include <IceE/Endpoint.h>
@@ -87,7 +87,7 @@ Ice::ObjectAdapter::getCommunicator() const
 void
 Ice::ObjectAdapter::activate()
 {
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     LocatorRegistryPrx locatorRegistry;
 #endif
     bool printAdapterReady = false;
@@ -99,7 +99,7 @@ Ice::ObjectAdapter::activate()
 
 	if(!_printAdapterReadyDone)
 	{
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 	    if(_locatorInfo && !_id.empty())
 	    {
 		locatorRegistry = _locatorInfo->getLocatorRegistry();
@@ -117,7 +117,7 @@ Ice::ObjectAdapter::activate()
     // We must call on the locator registry outside the thread
     // synchronization, to avoid deadlocks.
     //
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     if(locatorRegistry)
     {
 	//
@@ -439,7 +439,7 @@ Ice::ObjectAdapter::createReverseProxy(const Identity& ident) const
     return _instance->proxyFactory()->referenceToProxy(ref);
 }
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 void
 Ice::ObjectAdapter::addRouter(const RouterPrx& router)
 {
@@ -477,7 +477,7 @@ Ice::ObjectAdapter::addRouter(const RouterPrx& router)
 }
 #endif
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 void
 Ice::ObjectAdapter::setLocator(const LocatorPrx& locator)
 {
@@ -499,7 +499,7 @@ Ice::ObjectAdapter::isLocal(const ObjectPrx& proxy) const
     ReferencePtr ref = proxy->__reference();
     vector<EndpointPtr>::const_iterator p;
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     IndirectReferencePtr ir = IndirectReferencePtr::dynamicCast(ref);
     if(ir)
     {
@@ -538,7 +538,7 @@ Ice::ObjectAdapter::isLocal(const ObjectPrx& proxy) const
     // router's server proxy endpoints (if any), are also considered
     // local.
     //
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     for(p = endpoints.begin(); p != endpoints.end(); ++p)
     {
 	if(binary_search(_routerEndpoints.begin(), _routerEndpoints.end(), *p)) // _routerEndpoints is sorted.
@@ -637,7 +637,7 @@ Ice::ObjectAdapter::ObjectAdapter(const InstancePtr& instance, const Communicato
 	endpts = _instance->properties()->getProperty(name + ".PublishedEndpoints");
 	_publishedEndpoints = parseEndpoints(endpts);
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 	string router = _instance->properties()->getProperty(_name + ".Router");
 	if(!router.empty())
 	{
@@ -645,7 +645,7 @@ Ice::ObjectAdapter::ObjectAdapter(const InstancePtr& instance, const Communicato
 	}
 #endif
 	
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 	string locator = _instance->properties()->getProperty(_name + ".Locator");
 	if(!locator.empty())
 	{
@@ -692,19 +692,19 @@ Ice::ObjectAdapter::~ObjectAdapter()
 ObjectPrx
 Ice::ObjectAdapter::newProxy(const Identity& ident, const string& facet) const
 {
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     if(_id.empty())
     {
 #endif
 	return newDirectProxy(ident, facet);
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     }
     else
     {
 	//
 	// Create a reference with the adapter id.
 	//
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 	ReferencePtr ref = _instance->referenceFactory()->create(ident, Context(), facet,Reference::ModeTwoway, false,
 								 _id, 0, _locatorInfo);
 
@@ -745,14 +745,14 @@ Ice::ObjectAdapter::newDirectProxy(const Identity& ident, const string& facet) c
     // any. This way, object references created by this object adapter
     // will also point to the router's server proxy endpoints.
     //
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     copy(_routerEndpoints.begin(), _routerEndpoints.end(), back_inserter(endpoints));
 #endif
     
     //
     // Create a reference and return a proxy for this reference.
     //
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     ReferencePtr ref = _instance->referenceFactory()->create(ident, Context(), facet, Reference::ModeTwoway, false,
 							     endpoints, 0);
 #else
diff --git a/cppe/src/IceE/ObjectAdapterFactory.h b/cppe/src/IceE/ObjectAdapterFactory.h
index eb91ec4ed9e..57be9e3fb85 100644
--- a/cppe/src/IceE/ObjectAdapterFactory.h
+++ b/cppe/src/IceE/ObjectAdapterFactory.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_OBJECT_ADAPTER_FACTORY_H
-#define ICEE_OBJECT_ADAPTER_FACTORY_H
+#ifndef ICE_OBJECT_ADAPTER_FACTORY_H
+#define ICE_OBJECT_ADAPTER_FACTORY_H
 
 #include <IceE/ObjectAdapterF.h>
 #include <IceE/ProxyF.h>
diff --git a/cppe/src/IceE/Outgoing.cpp b/cppe/src/IceE/Outgoing.cpp
index e840ac2df25..c4ff162556c 100644
--- a/cppe/src/IceE/Outgoing.cpp
+++ b/cppe/src/IceE/Outgoing.cpp
@@ -51,7 +51,7 @@ IceInternal::Outgoing::Outgoing(Connection* connection, Reference* ref, const st
 	    break;
 	}
 
-#ifdef ICEE_HAS_BATCH
+#ifdef ICE_HAS_BATCH
 	case Reference::ModeBatchOneway:
 	{
 	    _connection->prepareBatchRequest(&_os);
@@ -236,7 +236,7 @@ IceInternal::Outgoing::invoke()
 	    break;
 	}
 
-#ifdef ICEE_HAS_BATCH
+#ifdef ICE_HAS_BATCH
 	case Reference::ModeBatchOneway:
 	{
 	    //
@@ -270,7 +270,7 @@ IceInternal::Outgoing::abort(const LocalException& ex)
     // notify the connection about that we give up ownership of the
     // batch stream.
     //
-#ifdef ICEE_HAS_BATCH
+#ifdef ICE_HAS_BATCH
     if(_reference->getMode() == Reference::ModeBatchOneway)
     {
 	_connection->abortBatchRequest();
diff --git a/cppe/src/IceE/OutgoingConnectionFactory.cpp b/cppe/src/IceE/OutgoingConnectionFactory.cpp
index a00d79ec530..c7056215812 100755
--- a/cppe/src/IceE/OutgoingConnectionFactory.cpp
+++ b/cppe/src/IceE/OutgoingConnectionFactory.cpp
@@ -18,7 +18,7 @@
 #include <IceE/RouterInfo.h>
 #include <IceE/LocalException.h>
 #include <IceE/Functional.h>
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 #   include <IceE/Reference.h>
 #endif
 #include <list>
@@ -247,7 +247,7 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointPtr>& endpts
 	    TransceiverPtr transceiver = connector->connect(timeout);
 	    assert(transceiver);
 
-#ifdef ICEE_PURE_CLIENT
+#ifdef ICE_PURE_CLIENT
 	    connection = new Connection(_instance, transceiver, endpoint);
 #else
 	    connection = new Connection(_instance, transceiver, endpoint, 0);
@@ -328,7 +328,7 @@ IceInternal::OutgoingConnectionFactory::create(const vector<EndpointPtr>& endpts
     return connection;
 }
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 
 void
 IceInternal::OutgoingConnectionFactory::setRouter(const RouterPrx& router)
@@ -350,7 +350,7 @@ IceInternal::OutgoingConnectionFactory::setRouter(const RouterPrx& router)
 	// received over such connections.
 	//
 	ObjectPrx proxy = routerInfo->getClientProxy();
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 	ObjectAdapterPtr adapter = routerInfo->getAdapter();
 #endif
 	vector<EndpointPtr> endpoints = proxy->__reference()->getEndpoints();
@@ -367,7 +367,7 @@ IceInternal::OutgoingConnectionFactory::setRouter(const RouterPrx& router)
 		endpoint = endpoint->timeout(_instance->defaultsAndOverrides()->overrideTimeoutValue);
 	    }
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 	    pair<multimap<EndpointPtr, ConnectionPtr>::iterator,
 		 multimap<EndpointPtr, ConnectionPtr>::iterator> pr = _connections.equal_range(endpoint);
 	    
@@ -392,7 +392,7 @@ IceInternal::OutgoingConnectionFactory::setRouter(const RouterPrx& router)
 
 #endif
 
-#ifdef ICEE_HAS_BATCH
+#ifdef ICE_HAS_BATCH
 void
 IceInternal::OutgoingConnectionFactory::flushBatchRequests()
 {
@@ -435,7 +435,7 @@ IceInternal::OutgoingConnectionFactory::~OutgoingConnectionFactory()
     assert(_connections.empty());
 }
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 
 void
 IceInternal::OutgoingConnectionFactory::removeAdapter(const ObjectAdapterPtr& adapter)
diff --git a/cppe/src/IceE/OutgoingConnectionFactory.h b/cppe/src/IceE/OutgoingConnectionFactory.h
index 3ca4f72dfdf..99fbaf2d8f3 100755
--- a/cppe/src/IceE/OutgoingConnectionFactory.h
+++ b/cppe/src/IceE/OutgoingConnectionFactory.h
@@ -7,15 +7,15 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_OUTGOING_CONNECTION_FACTORY_H
-#define ICEE_OUTGOING_CONNECTION_FACTORY_H
+#ifndef ICE_OUTGOING_CONNECTION_FACTORY_H
+#define ICE_OUTGOING_CONNECTION_FACTORY_H
 
 #include <IceE/OutgoingConnectionFactoryF.h>
 #include <IceE/ConnectionF.h>
 #include <IceE/InstanceF.h>
 #include <IceE/ObjectAdapterF.h>
 #include <IceE/EndpointF.h>
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 #   include <IceE/RouterF.h>
 #endif
 #include <IceE/Mutex.h>
@@ -34,11 +34,11 @@ public:
     void waitUntilFinished();
 
     Ice::ConnectionPtr create(const std::vector<EndpointPtr>&);
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     void setRouter(const ::Ice::RouterPrx&);
 #endif
     void removeAdapter(const ::Ice::ObjectAdapterPtr&);
-#ifdef ICEE_HAS_BATCH
+#ifdef ICE_HAS_BATCH
     void flushBatchRequests();
 #endif
 
diff --git a/cppe/src/IceE/Properties.cpp b/cppe/src/IceE/Properties.cpp
index 3e628783745..dd355d3b3a2 100644
--- a/cppe/src/IceE/Properties.cpp
+++ b/cppe/src/IceE/Properties.cpp
@@ -308,7 +308,7 @@ Ice::Properties::loadConfig()
 #ifndef _WIN32_WCE
     if(value.empty() || value == "1")
     {
-        const char* s = getenv("ICEE_CONFIG");
+        const char* s = getenv("ICE_CONFIG");
         if(s && *s != '\0')
         {
             value = s;
diff --git a/cppe/src/IceE/Protocol.h b/cppe/src/IceE/Protocol.h
index c1fa7c25d0e..9c463ad8286 100644
--- a/cppe/src/IceE/Protocol.h
+++ b/cppe/src/IceE/Protocol.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_PROTOCOL_H
-#define ICEE_PROTOCOL_H
+#ifndef ICE_PROTOCOL_H
+#define ICE_PROTOCOL_H
 
 #include <IceE/Config.h>
 
diff --git a/cppe/src/IceE/Proxy.cpp b/cppe/src/IceE/Proxy.cpp
index c10b7718c40..0784fe482a8 100644
--- a/cppe/src/IceE/Proxy.cpp
+++ b/cppe/src/IceE/Proxy.cpp
@@ -14,7 +14,7 @@
 #include <IceE/Instance.h>
 #include <IceE/BasicStream.h>
 #include <IceE/LocalException.h>
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 #   include <IceE/RouterInfo.h>
 #endif
 
@@ -298,7 +298,7 @@ IceProxy::Ice::Object::ice_id(const Context& __context)
     }
 }
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 bool
 IceProxy::Ice::Object::ice_invoke(const string& operation,
 				  OperationMode mode,
@@ -471,7 +471,7 @@ IceProxy::Ice::Object::ice_isOneway() const
     return _reference->getMode() == Reference::ModeOneway;
 }
 
-#ifdef ICEE_HAS_BATCH
+#ifdef ICE_HAS_BATCH
 ObjectPrx
 IceProxy::Ice::Object::ice_batchOneway() const
 {
@@ -511,7 +511,7 @@ IceProxy::Ice::Object::ice_timeout(int t) const
     }
 }
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 
 ObjectPrx
 IceProxy::Ice::Object::ice_router(const RouterPrx& router) const
@@ -531,7 +531,7 @@ IceProxy::Ice::Object::ice_router(const RouterPrx& router) const
 
 #endif
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 
 ObjectPrx
 IceProxy::Ice::Object::ice_locator(const LocatorPrx& locator) const
@@ -700,7 +700,7 @@ IceProxy::Ice::Object::__getDelegate()
 	// using a router, then add this proxy to the router info
 	// object.
 	//
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 	RoutableReferencePtr rr = RoutableReferencePtr::dynamicCast(_reference);
 	if(rr && rr->getRouterInfo())
 	{
@@ -880,7 +880,7 @@ IceDelegate::Ice::Object::ice_id(const Context& __context)
     return __ret;
 }
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 bool
 IceDelegate::Ice::Object::ice_invoke(const string& operation,
                                       OperationMode mode,
diff --git a/cppe/src/IceE/ProxyFactory.cpp b/cppe/src/IceE/ProxyFactory.cpp
index a55c3b83233..815d8ad14c0 100644
--- a/cppe/src/IceE/ProxyFactory.cpp
+++ b/cppe/src/IceE/ProxyFactory.cpp
@@ -96,7 +96,7 @@ IceInternal::ProxyFactory::checkRetryAfterException(const LocalException& ex, co
     // indirect. Otherwise, we don't retry other *NotExistException,
     // which are all derived from RequestFailedException.
     //
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     if(dynamic_cast<const ObjectNotExistException*>(&ex))
     {
 	IndirectReferencePtr ir = IndirectReferencePtr::dynamicCast(ref);
diff --git a/cppe/src/IceE/ProxyFactory.h b/cppe/src/IceE/ProxyFactory.h
index 6d953b56227..d4b5f1c16cb 100644
--- a/cppe/src/IceE/ProxyFactory.h
+++ b/cppe/src/IceE/ProxyFactory.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_PROXY_FACTORY_H
-#define ICEE_PROXY_FACTORY_H
+#ifndef ICE_PROXY_FACTORY_H
+#define ICE_PROXY_FACTORY_H
 
 #include <IceE/ProxyFactoryF.h>
 #include <IceE/InstanceF.h>
diff --git a/cppe/src/IceE/Reference.cpp b/cppe/src/IceE/Reference.cpp
index e470a334fee..2992a8d3724 100644
--- a/cppe/src/IceE/Reference.cpp
+++ b/cppe/src/IceE/Reference.cpp
@@ -15,13 +15,13 @@
 #include <IceE/Endpoint.h>
 #include <IceE/BasicStream.h>
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 #   include <IceE/RouterInfo.h>
 #   include <IceE/Router.h>
 #   include <IceE/Connection.h>
 #endif
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 #   include <IceE/LocatorInfo.h>
 #   include <IceE/Locator.h>
 #endif
@@ -452,7 +452,7 @@ IceInternal::FixedReference::getEndpoints() const
     return vector<EndpointPtr>();
 }
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 
 ReferencePtr
 IceInternal::FixedReference::changeRouter(const RouterPrx&) const
@@ -462,7 +462,7 @@ IceInternal::FixedReference::changeRouter(const RouterPrx&) const
 
 #endif
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 
 ReferencePtr
 IceInternal::FixedReference::changeLocator(const LocatorPrx&) const
@@ -501,7 +501,7 @@ IceInternal::FixedReference::getConnection() const
     // this support.
     //
     if(getSecure() || getMode() == ModeDatagram || getMode() == ModeBatchDatagram || _fixedConnections.empty()
-#ifndef ICEE_HAS_BATCH
+#ifndef ICE_HAS_BATCH
        || getMode() == ModeBatchOneway
 #endif
       )
@@ -526,7 +526,7 @@ IceInternal::FixedReference::getConnection() const
 	{
 	    ex.unsupportedFeature = "batch datagram";
 	}
-#ifndef ICEE_HAS_BATCH
+#ifndef ICE_HAS_BATCH
 	else if(getMode() == ModeBatchOneway)
 	{
 	    ex.unsupportedFeature = "batch";
@@ -599,7 +599,7 @@ IceInternal::FixedReference::FixedReference(const FixedReference& r)
 {
 }
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 void IceInternal::incRef(IceInternal::RoutableReference* p) { p->__incRef(); }
 void IceInternal::decRef(IceInternal::RoutableReference* p) { p->__decRef(); }
 
@@ -700,7 +700,7 @@ void IceInternal::incRef(IceInternal::DirectReference* p) { p->__incRef(); }
 void IceInternal::decRef(IceInternal::DirectReference* p) { p->__decRef(); }
 
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 IceInternal::DirectReference::DirectReference(const InstancePtr& inst, const Identity& ident,
 					      const Context& ctx, const string& fs, Mode md, bool sec,
 					      const vector<EndpointPtr>& endpts, const RouterInfoPtr& rtrInfo) :
@@ -743,12 +743,12 @@ IceInternal::DirectReference::changeDefault() const
     //
     // Return an indirect reference if a default locator is set.
     //
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     LocatorPrx loc = getInstance()->referenceFactory()->getDefaultLocator();
     if(loc)
     {
 	LocatorInfoPtr newLocatorInfo = getInstance()->locatorManager()->get(loc);
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 	return getInstance()->referenceFactory()->create(getIdentity(), Context(), "", ModeTwoway, false,
 							 "", 0, newLocatorInfo);
 #else
@@ -757,13 +757,13 @@ IceInternal::DirectReference::changeDefault() const
 #endif
     }
     else
-#endif // ICEE_HAS_LOCATOR
+#endif // ICE_HAS_LOCATOR
     {
 	return Parent::changeDefault();
     }
 }
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 
 ReferencePtr
 IceInternal::DirectReference::changeLocator(const LocatorPrx& newLocator) const
@@ -771,7 +771,7 @@ IceInternal::DirectReference::changeLocator(const LocatorPrx& newLocator) const
     if(newLocator)
     {
 	LocatorInfoPtr newLocatorInfo = getInstance()->locatorManager()->get(newLocator);
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 	return getInstance()->referenceFactory()->create(getIdentity(), getContext(), getFacet(), getMode(),
 							 getSecure(), "", 0, newLocatorInfo);
 #else
@@ -842,7 +842,7 @@ IceInternal::DirectReference::toString() const
 ConnectionPtr
 IceInternal::DirectReference::getConnection() const
 {
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     vector<EndpointPtr> endpts = Parent::getRoutedEndpoints();
     if(endpts.empty())
     {
@@ -863,7 +863,7 @@ IceInternal::DirectReference::getConnection() const
     ConnectionPtr connection = factory->create(filteredEndpoints);
     assert(connection);
 
-#if defined(ICEE_HAS_ROUTER) && !defined(ICEE_PURE_CLIENT)
+#if defined(ICE_HAS_ROUTER) && !defined(ICE_PURE_CLIENT)
 
     //
     // If we have a router, set the object adapter for this router
@@ -933,12 +933,12 @@ IceInternal::DirectReference::DirectReference(const DirectReference& r)
 {
 }
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 
 void IceInternal::incRef(IceInternal::IndirectReference* p) { p->__incRef(); }
 void IceInternal::decRef(IceInternal::IndirectReference* p) { p->__decRef(); }
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 IceInternal::IndirectReference::IndirectReference(const InstancePtr& inst, const Identity& ident,
                                                   const Context& ctx, const string& fs, Mode md, bool sec,
 						  const string& adptid, const RouterInfoPtr& rtrInfo,
@@ -974,7 +974,7 @@ IceInternal::IndirectReference::changeDefault() const
     LocatorPrx loc = getInstance()->referenceFactory()->getDefaultLocator();
     if(!loc)
     {
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 	return getInstance()->referenceFactory()->create(getIdentity(), Context(), "", ModeTwoway, false,
 							 vector<EndpointPtr>(), getRouterInfo());
 #else
@@ -998,7 +998,7 @@ IceInternal::IndirectReference::changeLocator(const LocatorPrx& newLocator) cons
     //
     if(!newLocator)
     {
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 	return getInstance()->referenceFactory()->create(getIdentity(), getContext(), getFacet(), getMode(),
 							 getSecure(), vector<EndpointPtr>(), getRouterInfo());
 #else
@@ -1077,7 +1077,7 @@ IceInternal::IndirectReference::getConnection() const
 
     while(true)
     {
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 	vector<EndpointPtr> endpts = Parent::getRoutedEndpoints();
 #else
 	vector<EndpointPtr> endpts;
@@ -1104,7 +1104,7 @@ IceInternal::IndirectReference::getConnection() const
 	}
 	catch(const LocalException& ex)
 	{
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 	    if(!getRouterInfo())
 #endif
 	    {
@@ -1132,7 +1132,7 @@ IceInternal::IndirectReference::getConnection() const
 	break;
     }
 
-#if defined(ICEE_HAS_ROUTER) && !defined(ICEE_PURE_CLIENT)
+#if defined(ICE_HAS_ROUTER) && !defined(ICE_PURE_CLIENT)
     //
     // If we have a router, set the object adapter for this router
     // (if any) to the new connection, so that callbacks from the
@@ -1210,7 +1210,7 @@ IceInternal::IndirectReference::IndirectReference(const IndirectReference& r)
 {
 }
 
-#endif // ICEE_HAS_LOCATOR
+#endif // ICE_HAS_LOCATOR
 
 vector<EndpointPtr>
 IceInternal::filterEndpoints(const vector<EndpointPtr>& allEndpoints, Reference::Mode m, bool sec)
@@ -1223,7 +1223,7 @@ IceInternal::filterEndpoints(const vector<EndpointPtr>& allEndpoints, Reference:
     // lacks this support we throw an unsupported feature.
     //
     if(sec || m == Reference::ModeDatagram || m == Reference::ModeBatchDatagram
-#ifndef ICEE_HAS_BATCH
+#ifndef ICE_HAS_BATCH
        || m == Reference::ModeBatchOneway
 #endif
 	)
@@ -1241,7 +1241,7 @@ IceInternal::filterEndpoints(const vector<EndpointPtr>& allEndpoints, Reference:
 	{
 	    ex.unsupportedFeature = "batch datagram";
 	}
-#ifndef ICEE_HAS_BATCH
+#ifndef ICE_HAS_BATCH
 	else if(m == Reference::ModeBatchOneway)
 	{
 	    ex.unsupportedFeature = "batch";
diff --git a/cppe/src/IceE/Reference.h b/cppe/src/IceE/Reference.h
index 74c70073adc..de55201a092 100644
--- a/cppe/src/IceE/Reference.h
+++ b/cppe/src/IceE/Reference.h
@@ -7,18 +7,18 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_REFERENCE_H
-#define ICEE_REFERENCE_H
+#ifndef ICE_REFERENCE_H
+#define ICE_REFERENCE_H
 
 #include <IceE/ReferenceF.h>
 #include <IceE/EndpointF.h>
 #include <IceE/InstanceF.h>
 #include <IceE/CommunicatorF.h>
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 #  include <IceE/RouterInfoF.h>
 #  include <IceE/RouterF.h>
 #endif
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 #  include <IceE/LocatorInfoF.h>
 #  include <IceE/LocatorF.h>
 #endif
@@ -75,10 +75,10 @@ public:
     //
     virtual ReferencePtr changeDefault() const;
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const = 0;
 #endif
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const = 0;
 #endif
     virtual ReferencePtr changeTimeout(int) const = 0;
@@ -138,10 +138,10 @@ public:
 
     virtual std::vector<EndpointPtr> getEndpoints() const;
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const;
 #endif
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const;
 #endif
     virtual ReferencePtr changeTimeout(int) const;
@@ -166,7 +166,7 @@ private:
     std::vector<Ice::ConnectionPtr> _fixedConnections;
 };
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 class RoutableReference : public Reference
 {
 public:
@@ -200,7 +200,7 @@ private:
 #endif
 
 class DirectReference :
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     public RoutableReference
 #else
     public Reference
@@ -210,7 +210,7 @@ public:
 
     DirectReference(const InstancePtr&, const Ice::Identity&, const Ice::Context&, const std::string&, Mode,
 		    bool, const std::vector<EndpointPtr>&
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 		    , const RouterInfoPtr&
 #endif
 		    );
@@ -221,7 +221,7 @@ public:
 
     virtual ReferencePtr changeDefault() const;
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     virtual ReferencePtr changeLocator(const Ice::LocatorPrx&) const;
 #endif
     virtual ReferencePtr changeTimeout(int) const;
@@ -244,17 +244,17 @@ private:
 
     std::vector<EndpointPtr> _endpoints;
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     typedef RoutableReference Parent;
 #else
     typedef Reference Parent;
 #endif
 };
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 
 class IndirectReference :
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     public RoutableReference
 #else
     public Reference
@@ -264,7 +264,7 @@ public:
 
     IndirectReference(const InstancePtr&, const Ice::Identity&, const Ice::Context&, const std::string&,
                       Mode, bool, const std::string&
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 		      , const RouterInfoPtr&
 #endif
 		      , const LocatorInfoPtr&);
@@ -297,14 +297,14 @@ private:
 
     std::string _adapterId;
     LocatorInfoPtr _locatorInfo;
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     typedef RoutableReference Parent;
 #else
     typedef Reference Parent;
 #endif
 };
 
-#endif // ICEE_HAS_LOCATOR
+#endif // ICE_HAS_LOCATOR
 
 std::vector<EndpointPtr> filterEndpoints(const std::vector<EndpointPtr>&, Reference::Mode, bool);
 
diff --git a/cppe/src/IceE/ReferenceFactory.cpp b/cppe/src/IceE/ReferenceFactory.cpp
index e958257edeb..6a2e0649c66 100644
--- a/cppe/src/IceE/ReferenceFactory.cpp
+++ b/cppe/src/IceE/ReferenceFactory.cpp
@@ -12,10 +12,10 @@
 #include <IceE/Instance.h>
 #include <IceE/IdentityUtil.h>
 #include <IceE/EndpointFactory.h>
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 #   include <IceE/RouterInfo.h>
 #endif
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 #   include <IceE/LocatorInfo.h>
 #endif
 #include <IceE/BasicStream.h>
@@ -56,7 +56,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
 				      Reference::Mode mode,
 				      bool secure,
 				      const vector<EndpointPtr>& endpoints
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 				      , const RouterInfoPtr& routerInfo
 #endif
 				      )
@@ -76,14 +76,14 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
     //
     // Create new reference
     //
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     return new DirectReference(_instance, ident, context, facet, mode, secure, endpoints, routerInfo);
 #else
     return new DirectReference(_instance, ident, context, facet, mode, secure, endpoints);
 #endif
 }
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 
 ReferencePtr
 IceInternal::ReferenceFactory::create(const Identity& ident,
@@ -92,7 +92,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
 				      Reference::Mode mode,
 				      bool secure,
 				      const string& adapterId
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 				      , const RouterInfoPtr& routerInfo
 #endif
 				      , const LocatorInfoPtr& locatorInfo)
@@ -112,7 +112,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
     //
     // Create new reference
     //
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     return new IndirectReference(_instance, ident, context, facet, mode, secure, adapterId, routerInfo, locatorInfo);
 #else
     return new IndirectReference(_instance, ident, context, facet, mode, secure, adapterId, locatorInfo);
@@ -418,17 +418,17 @@ IceInternal::ReferenceFactory::create(const string& str)
 	}
     }
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     RouterInfoPtr routerInfo = _instance->routerManager()->get(getDefaultRouter());
 #endif
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     LocatorInfoPtr locatorInfo = _instance->locatorManager()->get(getDefaultLocator());
 #endif
 
     if(beg == string::npos)
     {
-#ifdef ICEE_HAS_LOCATOR
-#   ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_LOCATOR
+#   ifdef ICE_HAS_ROUTER
 	return create(ident, Context(), facet, mode, secure, "", routerInfo, locatorInfo);
 #   else
 	return create(ident, Context(), facet, mode, secure, "", locatorInfo);
@@ -487,7 +487,7 @@ IceInternal::ReferenceFactory::create(const string& str)
 		}
 	    }
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 	    return create(ident, Context(), facet, mode, secure, endpoints , routerInfo);
 #else
 	    return create(ident, Context(), facet, mode, secure, endpoints);
@@ -495,7 +495,7 @@ IceInternal::ReferenceFactory::create(const string& str)
 	    break;
 	}
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 	case '@':
 	{
 	    beg = s.find_first_not_of(delim, beg + 1);
@@ -533,7 +533,7 @@ IceInternal::ReferenceFactory::create(const string& str)
 		throw ex;
 	    }
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 	    return create(ident, Context(), facet, mode, secure, adapter, routerInfo, locatorInfo);
 #else
 	    return create(ident, Context(), facet, mode, secure, adapter, locatorInfo);
@@ -589,7 +589,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
     vector<EndpointPtr> endpoints;
     string adapterId;
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     RouterInfoPtr routerInfo = _instance->routerManager()->get(getDefaultRouter());
 #endif
 
@@ -607,7 +607,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
 	    EndpointPtr endpoint = _instance->endpointFactory()->read(s);
 	    endpoints.push_back(endpoint);
 	}
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 	return create(ident, Context(), facet, mode, secure, endpoints, routerInfo);
 #else
 	return create(ident, Context(), facet, mode, secure, endpoints);
@@ -615,10 +615,10 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
     }
     else
     {
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 	LocatorInfoPtr locatorInfo = _instance->locatorManager()->get(getDefaultLocator());
 	s->read(adapterId);
-#   ifdef ICEE_HAS_ROUTER
+#   ifdef ICE_HAS_ROUTER
 	return create(ident, Context(), facet, mode, secure, adapterId, routerInfo, locatorInfo);
 #   else
 	return create(ident, Context(), facet, mode, secure, adapterId, locatorInfo);
@@ -629,7 +629,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
     }
 }
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 
 void
 IceInternal::ReferenceFactory::setDefaultRouter(const RouterPrx& defaultRouter)
@@ -647,7 +647,7 @@ IceInternal::ReferenceFactory::getDefaultRouter() const
 
 #endif
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
 
 void
 IceInternal::ReferenceFactory::setDefaultLocator(const LocatorPrx& defaultLocator)
@@ -681,10 +681,10 @@ IceInternal::ReferenceFactory::destroy()
     }
 
     _instance = 0;
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     _defaultRouter = 0;
 #endif
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     _defaultLocator = 0;
 #endif
 }
diff --git a/cppe/src/IceE/ReferenceFactory.h b/cppe/src/IceE/ReferenceFactory.h
index d2c4c4482ae..36afbbd75e2 100644
--- a/cppe/src/IceE/ReferenceFactory.h
+++ b/cppe/src/IceE/ReferenceFactory.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_REFERENCE_FACTORY_H
-#define ICEE_REFERENCE_FACTORY_H
+#ifndef ICE_REFERENCE_FACTORY_H
+#define ICE_REFERENCE_FACTORY_H
 
 #include <IceE/ReferenceFactoryF.h>
 #include <IceE/ConnectionF.h>
@@ -33,17 +33,17 @@ public:
     //
     ReferencePtr create(const ::Ice::Identity&, const ::Ice::Context&, const ::std::string&,
 			Reference::Mode, bool, const ::std::vector<EndpointPtr>&
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 			, const RouterInfoPtr&
 #endif
 			);
     //
     // Create an indirect reference.
     //
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     ReferencePtr create(const ::Ice::Identity&, const ::Ice::Context&, const ::std::string&,
 			Reference::Mode, bool, const ::std::string&
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 			, const RouterInfoPtr&
 #endif
 			, const LocatorInfoPtr&);
@@ -64,12 +64,12 @@ public:
     //
     ReferencePtr create(const ::Ice::Identity&, BasicStream*);
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     void setDefaultRouter(const ::Ice::RouterPrx&);
     ::Ice::RouterPrx getDefaultRouter() const;
 #endif
 
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     void setDefaultLocator(const ::Ice::LocatorPrx&);
     ::Ice::LocatorPrx getDefaultLocator() const;
 #endif
@@ -81,10 +81,10 @@ private:
     friend class Instance;
 
     InstancePtr _instance;
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
     ::Ice::RouterPrx _defaultRouter;
 #endif
-#ifdef ICEE_HAS_LOCATOR
+#ifdef ICE_HAS_LOCATOR
     ::Ice::LocatorPrx _defaultLocator;
 #endif
 };
diff --git a/cppe/src/IceE/ReferenceFactoryF.h b/cppe/src/IceE/ReferenceFactoryF.h
index 2cb59c91bb6..2f95b92861a 100644
--- a/cppe/src/IceE/ReferenceFactoryF.h
+++ b/cppe/src/IceE/ReferenceFactoryF.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_REFERENCE_FACTORY_F_H
-#define ICEE_REFERENCE_FACTORY_F_H
+#ifndef ICE_REFERENCE_FACTORY_F_H
+#define ICE_REFERENCE_FACTORY_F_H
 
 #include <IceE/Handle.h>
 
diff --git a/cppe/src/IceE/RouterInfo.cpp b/cppe/src/IceE/RouterInfo.cpp
index 130166f4e23..0bf81ed60ac 100644
--- a/cppe/src/IceE/RouterInfo.cpp
+++ b/cppe/src/IceE/RouterInfo.cpp
@@ -9,7 +9,7 @@
 
 #include <IceE/Config.h>
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 
 #include <IceE/RouterInfo.h>
 #include <IceE/Router.h>
@@ -97,7 +97,7 @@ IceInternal::RouterInfo::destroy()
 
     _clientProxy = 0;
     _serverProxy = 0;
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     _adapter = 0;
 #endif
     _routingTable->clear();
@@ -210,7 +210,7 @@ IceInternal::RouterInfo::addProxy(const ObjectPrx& proxy)
     }
 }
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 void
 IceInternal::RouterInfo::setAdapter(const ObjectAdapterPtr& adapter)
 {
diff --git a/cppe/src/IceE/RouterInfo.h b/cppe/src/IceE/RouterInfo.h
index e641a132943..a9949f75dd9 100644
--- a/cppe/src/IceE/RouterInfo.h
+++ b/cppe/src/IceE/RouterInfo.h
@@ -7,17 +7,17 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_ROUTER_INFO_H
-#define ICEE_ROUTER_INFO_H
+#ifndef ICE_ROUTER_INFO_H
+#define ICE_ROUTER_INFO_H
 
 #include <IceE/Config.h>
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 
 #include <IceE/RouterInfoF.h>
 #include <IceE/RouterF.h>
 #include <IceE/RoutingTableF.h>
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 #    include <IceE/ObjectAdapterF.h>
 #endif
 #include <IceE/Shared.h>
@@ -64,7 +64,7 @@ public:
     Ice::ObjectPrx getServerProxy();
     void setServerProxy(const Ice::ObjectPrx&);
     void addProxy(const Ice::ObjectPrx&);
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     void setAdapter(const Ice::ObjectAdapterPtr&);
     Ice::ObjectAdapterPtr getAdapter() const;
 #endif
@@ -75,7 +75,7 @@ private:
     Ice::ObjectPrx _clientProxy;
     Ice::ObjectPrx _serverProxy;
     const RoutingTablePtr _routingTable;
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     Ice::ObjectAdapterPtr _adapter;
 #endif
 };
diff --git a/cppe/src/IceE/RouterInfoF.h b/cppe/src/IceE/RouterInfoF.h
index 33f02b33a01..5c5bcd33b80 100644
--- a/cppe/src/IceE/RouterInfoF.h
+++ b/cppe/src/IceE/RouterInfoF.h
@@ -7,12 +7,12 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_ROUTER_INFO_F_H
-#define ICEE_ROUTER_INFO_F_H
+#ifndef ICE_ROUTER_INFO_F_H
+#define ICE_ROUTER_INFO_F_H
 
 #include <IceE/Config.h>
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 
 #include <IceE/Handle.h>
 
diff --git a/cppe/src/IceE/RoutingTable.cpp b/cppe/src/IceE/RoutingTable.cpp
index fb6900f571b..ffc5f925849 100644
--- a/cppe/src/IceE/RoutingTable.cpp
+++ b/cppe/src/IceE/RoutingTable.cpp
@@ -9,7 +9,7 @@
 
 #include <IceE/Config.h>
 
-#ifdef ICEE_HAS_ROUTER
+#ifdef ICE_HAS_ROUTER
 
 #include <IceE/RoutingTable.h>
 #include <IceE/Proxy.h>
diff --git a/cppe/src/IceE/RoutingTable.h b/cppe/src/IceE/RoutingTable.h
index b2406e17453..4069ca01efd 100644
--- a/cppe/src/IceE/RoutingTable.h
+++ b/cppe/src/IceE/RoutingTable.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_ROUTING_TABLE_H
-#define ICEE_ROUTING_TABLE_H
+#ifndef ICE_ROUTING_TABLE_H
+#define ICE_ROUTING_TABLE_H
 
 #include <IceE/RoutingTableF.h>
 #include <IceE/ProxyF.h>
@@ -27,7 +27,7 @@ struct Identity;
 namespace IceInternal
 {
 
-class ICEE_API RoutingTable : public IceUtil::Shared, public IceUtil::Mutex
+class ICE_API RoutingTable : public IceUtil::Shared, public IceUtil::Mutex
 {
 public:
 
diff --git a/cppe/src/IceE/RoutingTableF.h b/cppe/src/IceE/RoutingTableF.h
index ed36b641dc9..e5f97cfd329 100644
--- a/cppe/src/IceE/RoutingTableF.h
+++ b/cppe/src/IceE/RoutingTableF.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_ROUTING_TABLE_F_H
-#define ICEE_ROUTING_TABLE_F_H
+#ifndef ICE_ROUTING_TABLE_F_H
+#define ICE_ROUTING_TABLE_F_H
 
 #include <IceE/Handle.h>
 
@@ -16,8 +16,8 @@ namespace IceInternal
 {
 
 class RoutingTable;
-ICEE_API void incRef(RoutingTable*);
-ICEE_API void decRef(RoutingTable*);
+ICE_API void incRef(RoutingTable*);
+ICE_API void decRef(RoutingTable*);
 typedef IceInternal::Handle<RoutingTable> RoutingTablePtr;
 
 }
diff --git a/cppe/src/IceE/ServantManager.h b/cppe/src/IceE/ServantManager.h
index 5ff025bf3cb..e0664cd899d 100644
--- a/cppe/src/IceE/ServantManager.h
+++ b/cppe/src/IceE/ServantManager.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_SERVANT_MANAGER_H
-#define ICEE_SERVANT_MANAGER_H
+#ifndef ICE_SERVANT_MANAGER_H
+#define ICE_SERVANT_MANAGER_H
 
 #include <IceE/ServantManagerF.h>
 #include <IceE/InstanceF.h>
diff --git a/cppe/src/IceE/Shared.cpp b/cppe/src/IceE/Shared.cpp
index 55a189114c8..86925417f7d 100644
--- a/cppe/src/IceE/Shared.cpp
+++ b/cppe/src/IceE/Shared.cpp
@@ -24,23 +24,23 @@ IceUtil::SimpleShared::SimpleShared(const SimpleShared&) :
 }
 
 IceUtil::Shared::Shared() :
-#ifndef ICEE_HAS_ATOMIC_FUNCTIONS
+#ifndef ICE_HAS_ATOMIC_FUNCTIONS
     _ref(0),
 #endif
     _noDelete(false)
 {
-#ifdef ICEE_HAS_ATOMIC_FUNCTIONS
+#ifdef ICE_HAS_ATOMIC_FUNCTIONS
     ice_atomic_set(&_ref, 0);
 #endif
 }
 
 IceUtil::Shared::Shared(const Shared&) :
-#ifndef ICEE_HAS_ATOMIC_FUNCTIONS
+#ifndef ICE_HAS_ATOMIC_FUNCTIONS
     _ref(0),
 #endif
     _noDelete(false)
 {
-#ifdef ICEE_HAS_ATOMIC_FUNCTIONS
+#ifdef ICE_HAS_ATOMIC_FUNCTIONS
     ice_atomic_set(&_ref, 0);
 #endif
 }
@@ -50,7 +50,7 @@ IceUtil::Shared::__getRef() const
 {
 #if defined(_WIN32)
     return InterlockedExchangeAdd(const_cast<LONG*>(&_ref), 0);
-#elif defined(ICEE_HAS_ATOMIC_FUNCTIONS)
+#elif defined(ICE_HAS_ATOMIC_FUNCTIONS)
     return ice_atomic_exchange_add(0, const_cast<ice_atomic_t*>(&_ref));
 #else
     _mutex.lock();
diff --git a/cppe/src/IceE/StaticMutex.cpp b/cppe/src/IceE/StaticMutex.cpp
index ed7a7fbd0f1..b5c2ad79094 100644
--- a/cppe/src/IceE/StaticMutex.cpp
+++ b/cppe/src/IceE/StaticMutex.cpp
@@ -39,4 +39,4 @@ void IceUtil::StaticMutex::initialize() const
 }
 #endif
 
-IceUtil::StaticMutex IceUtil::globalMutex = ICEE_STATIC_MUTEX_INITIALIZER;
+IceUtil::StaticMutex IceUtil::globalMutex = ICE_STATIC_MUTEX_INITIALIZER;
diff --git a/cppe/src/IceE/TraceLevels.h b/cppe/src/IceE/TraceLevels.h
index c7a89b798b4..762c7afe31d 100644
--- a/cppe/src/IceE/TraceLevels.h
+++ b/cppe/src/IceE/TraceLevels.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_TRACE_LEVELS_H
-#define ICEE_TRACE_LEVELS_H
+#ifndef ICE_TRACE_LEVELS_H
+#define ICE_TRACE_LEVELS_H
 
 #include <IceE/Shared.h>
 #include <IceE/TraceLevelsF.h>
diff --git a/cppe/src/IceE/TraceUtil.cpp b/cppe/src/IceE/TraceUtil.cpp
index bd2aa5f493d..7509cc99d11 100644
--- a/cppe/src/IceE/TraceUtil.cpp
+++ b/cppe/src/IceE/TraceUtil.cpp
@@ -245,7 +245,7 @@ IceInternal::traceRequest(const char* heading, const BasicStream& str, const Log
     }
 }
 
-#ifdef ICEE_HAS_BATCH
+#ifdef ICE_HAS_BATCH
 void
 IceInternal::traceBatchRequest(const char* heading, const BasicStream& str, const LoggerPtr& logger,
 			       const TraceLevelsPtr& tl)
diff --git a/cppe/src/IceE/TraceUtil.h b/cppe/src/IceE/TraceUtil.h
index 276030a9f79..3701f46c94a 100644
--- a/cppe/src/IceE/TraceUtil.h
+++ b/cppe/src/IceE/TraceUtil.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_TRACE_UTIL_H
-#define ICEE_TRACE_UTIL_H
+#ifndef ICE_TRACE_UTIL_H
+#define ICE_TRACE_UTIL_H
 
 #include <IceE/LoggerF.h>
 #include <IceE/TraceLevelsF.h>
@@ -20,7 +20,7 @@ class BasicStream;
 
 void traceHeader(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
 void traceRequest(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
-#ifdef ICEE_HAS_BATCH
+#ifdef ICE_HAS_BATCH
 void traceBatchRequest(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
 #endif
 void traceReply(const char*, const BasicStream&, const ::Ice::LoggerPtr&, const TraceLevelsPtr&);
diff --git a/cppe/src/IceE/Transceiver.h b/cppe/src/IceE/Transceiver.h
index 5bf421e8153..06612fdd095 100644
--- a/cppe/src/IceE/Transceiver.h
+++ b/cppe/src/IceE/Transceiver.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_TRANSCEIVER_H
-#define ICEE_TRANSCEIVER_H
+#ifndef ICE_TRANSCEIVER_H
+#define ICE_TRANSCEIVER_H
 
 #include <IceE/TransceiverF.h>
 #include <IceE/InstanceF.h>
@@ -30,7 +30,7 @@ class Connector;
 class Acceptor;
 class Buffer;
 
-class ICEE_API Transceiver : public ::IceUtil::Shared
+class ICE_API Transceiver : public ::IceUtil::Shared
 {
 public:
 
diff --git a/cppe/src/IceE/UUID.cpp b/cppe/src/IceE/UUID.cpp
index abbd879f37c..66f059d3878 100644
--- a/cppe/src/IceE/UUID.cpp
+++ b/cppe/src/IceE/UUID.cpp
@@ -68,7 +68,7 @@ const char* IceUtil::UUIDGenerationException::_name = "IceUtil::UUIDGenerationEx
 
 #ifdef _WIN32_WCE
 
-static IceUtil::StaticMutex staticMutex = ICEE_STATIC_MUTEX_INITIALIZER;
+static IceUtil::StaticMutex staticMutex = ICE_STATIC_MUTEX_INITIALIZER;
 static HCRYPTPROV cryptProv = 0;
 
 namespace
@@ -108,7 +108,7 @@ static UUIDCleanup uuidCleanup;
 // a static mutex.
 //
 
-static IceUtil::StaticMutex staticMutex = ICEE_STATIC_MUTEX_INITIALIZER;
+static IceUtil::StaticMutex staticMutex = ICE_STATIC_MUTEX_INITIALIZER;
 static int fd = -1;
 static char myPid[2];
 
diff --git a/cppe/src/IceE/UnknownEndpoint.cpp b/cppe/src/IceE/UnknownEndpoint.cpp
index 3c259628faa..aaec152b89c 100644
--- a/cppe/src/IceE/UnknownEndpoint.cpp
+++ b/cppe/src/IceE/UnknownEndpoint.cpp
@@ -71,7 +71,7 @@ IceInternal::UnknownEndpoint::connector() const
     return 0;
 }
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 AcceptorPtr
 IceInternal::UnknownEndpoint::acceptor(EndpointPtr& endp) const
 {
@@ -86,7 +86,7 @@ IceInternal::UnknownEndpoint::equivalent(const TransceiverPtr&) const
     return false;
 }
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 bool
 IceInternal::UnknownEndpoint::equivalent(const AcceptorPtr&) const
 {
diff --git a/cppe/src/IceE/UnknownEndpoint.h b/cppe/src/IceE/UnknownEndpoint.h
index 16e5fbf33c6..4a3a32c3a43 100644
--- a/cppe/src/IceE/UnknownEndpoint.h
+++ b/cppe/src/IceE/UnknownEndpoint.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_UNKNOWN_ENDPOINT_H
-#define ICEE_UNKNOWN_ENDPOINT_H
+#ifndef ICE_UNKNOWN_ENDPOINT_H
+#define ICE_UNKNOWN_ENDPOINT_H
 
 #include <IceE/Endpoint.h>
 
@@ -28,11 +28,11 @@ public:
     virtual EndpointPtr timeout(Ice::Int) const;
     virtual bool unknown() const;
     virtual ConnectorPtr connector() const;
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     virtual AcceptorPtr acceptor(EndpointPtr&) const;
 #endif
     virtual bool equivalent(const TransceiverPtr&) const;
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     virtual bool equivalent(const AcceptorPtr&) const;
 #endif
 
diff --git a/cppe/src/IceE/ice.dsp b/cppe/src/IceE/ice.dsp
index d625938526c..a747d8f72a1 100755
--- a/cppe/src/IceE/ice.dsp
+++ b/cppe/src/IceE/ice.dsp
@@ -45,7 +45,7 @@ CFG=ice - Win32 Debug
 SLICE2CPPEFLAGS=-DICEE
 CPP=cl.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "_USRDLL" /D "ICEE_API_EXPORTS" /D "ICEE_PROTOCOL_API_EXPORTS" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "_USRDLL" /D "ICE_API_EXPORTS" /D "ICE_PROTOCOL_API_EXPORTS" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /Fr /YX
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -82,7 +82,7 @@ PostBuild_Cmds=copy $(OutDir)\icee.lib ..\..\lib\	copy $(OutDir)\icee10.dll ..\.
 SLICE2CPPEFLAGS=-DICEE
 CPP=cl.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "_USRDLL" /D "ICEE_API_EXPORTS" /D "ICEE_PROTOCOL_API_EXPORTS" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "_USRDLL" /D "ICE_API_EXPORTS" /D "ICE_PROTOCOL_API_EXPORTS" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /GZ /c
 # SUBTRACT CPP /Fr /YX
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -120,7 +120,7 @@ SLICE2CPPEFLAGS=-DICEE
 MTL=midl.exe
 CPP=cl.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "ICE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /c
 # SUBTRACT CPP /Fr /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -153,7 +153,7 @@ SLICE2CPPEFLAGS=-DICEE
 MTL=midl.exe
 CPP=cl.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "ICE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /FD /GZ /c
 # SUBTRACT CPP /Fr /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -626,7 +626,7 @@ SOURCE=..\..\slice\IceE\BuiltinSequences.ice
 InputPath=..\..\slice\IceE\BuiltinSequences.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -643,7 +643,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\BuiltinSequences.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -660,7 +660,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\BuiltinSequences.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -677,7 +677,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\BuiltinSequences.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -701,7 +701,7 @@ SOURCE=..\..\slice\IceE\FacetMap.ice
 InputPath=..\..\slice\IceE\FacetMap.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -718,7 +718,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\FacetMap.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -735,7 +735,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\FacetMap.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -752,7 +752,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\FacetMap.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -776,7 +776,7 @@ SOURCE=..\..\slice\IceE\Identity.ice
 InputPath=..\..\slice\IceE\Identity.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -793,7 +793,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Identity.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -810,7 +810,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Identity.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -827,7 +827,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Identity.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -851,7 +851,7 @@ SOURCE=..\..\slice\IceE\Locator.ice
 InputPath=..\..\slice\IceE\Locator.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -868,7 +868,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Locator.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -885,7 +885,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Locator.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -902,7 +902,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Locator.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -926,7 +926,7 @@ SOURCE=..\..\slice\IceE\LocatorF.ice
 InputPath=..\..\slice\IceE\LocatorF.ice
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -937,7 +937,7 @@ InputPath=..\..\slice\IceE\LocatorF.ice
 InputPath=..\..\slice\IceE\LocatorF.ice
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -948,7 +948,7 @@ InputPath=..\..\slice\IceE\LocatorF.ice
 InputPath=..\..\slice\IceE\LocatorF.ice
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -959,7 +959,7 @@ InputPath=..\..\slice\IceE\LocatorF.ice
 InputPath=..\..\slice\IceE\LocatorF.ice
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -977,7 +977,7 @@ SOURCE=..\..\slice\IceE\Logger.ice
 InputPath=..\..\slice\IceE\Logger.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -994,7 +994,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Logger.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -1011,7 +1011,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Logger.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -1028,7 +1028,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Logger.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -1052,7 +1052,7 @@ SOURCE=..\..\slice\IceE\LoggerF.ice
 InputPath=..\..\slice\IceE\LoggerF.ice
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -1064,7 +1064,7 @@ InputPath=..\..\slice\IceE\LoggerF.ice
 InputPath=..\..\slice\IceE\LoggerF.ice
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -1076,7 +1076,7 @@ InputPath=..\..\slice\IceE\LoggerF.ice
 InputPath=..\..\slice\IceE\LoggerF.ice
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -1088,7 +1088,7 @@ InputPath=..\..\slice\IceE\LoggerF.ice
 InputPath=..\..\slice\IceE\LoggerF.ice
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -1107,7 +1107,7 @@ SOURCE=..\..\slice\IceE\Router.ice
 InputPath=..\..\slice\IceE\Router.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -1124,7 +1124,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Router.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -1141,7 +1141,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Router.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -1158,7 +1158,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Router.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -1182,7 +1182,7 @@ SOURCE=..\..\slice\IceE\RouterF.ice
 InputPath=..\..\slice\IceE\RouterF.ice
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -1194,7 +1194,7 @@ InputPath=..\..\slice\IceE\RouterF.ice
 InputPath=..\..\slice\IceE\RouterF.ice
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -1206,7 +1206,7 @@ InputPath=..\..\slice\IceE\RouterF.ice
 InputPath=..\..\slice\IceE\RouterF.ice
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -1218,7 +1218,7 @@ InputPath=..\..\slice\IceE\RouterF.ice
 InputPath=..\..\slice\IceE\RouterF.ice
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
diff --git a/cppe/src/IceE/ice.vcp b/cppe/src/IceE/ice.vcp
index 0264c1f11f4..e336e33aa64 100755
--- a/cppe/src/IceE/ice.vcp
+++ b/cppe/src/IceE/ice.vcp
@@ -58,7 +58,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_USRDLL" /D "ICE_EXPORTS" /YX /Gs8192 /GF /O2 /c
-# ADD CPP /nologo /W3 /GR /GX /Oxs /I ".." /I "../../include" /D "_i386_" /D "_X86_" /D "x86" /D "NDEBUG" /D "UNICODE" /D "_UNICODE" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "_USRDLL" /D "ICEE_API_EXPORTS" /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /GR /GX /Oxs /I ".." /I "../../include" /D "_i386_" /D "_X86_" /D "x86" /D "NDEBUG" /D "UNICODE" /D "_UNICODE" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "_USRDLL" /D "ICE_API_EXPORTS" /Gs8192 /GF /c
 # SUBTRACT CPP /YX
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -92,7 +92,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /GR /GX /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_USRDLL" /D "ICE_EXPORTS" /YX /Gs8192 /GF /c
-# ADD CPP /nologo /W3 /GR /GX /Zi /Od /I ".." /I "../../include" /D "DEBUG" /D "_i386_" /D "_X86_" /D "x86" /D "UNICODE" /D "_UNICODE" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "_USRDLL" /D "ICEE_API_EXPORTS" /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /GR /GX /Zi /Od /I ".." /I "../../include" /D "DEBUG" /D "_i386_" /D "_X86_" /D "x86" /D "UNICODE" /D "_UNICODE" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "_USRDLL" /D "ICE_API_EXPORTS" /Gs8192 /GF /c
 # SUBTRACT CPP /YX
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -126,7 +126,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "ICE_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /GR /GX /Gy /I ".." /I "../../include" /D "ARM" /D "_ARM_" /D "ARMV4" /D "NDEBUG" /D "UNICODE" /D "_UNICODE" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "_USRDLL" /D "ICEE_API_EXPORTS" /O2 /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /GR /GX /Gy /I ".." /I "../../include" /D "ARM" /D "_ARM_" /D "ARMV4" /D "NDEBUG" /D "UNICODE" /D "_UNICODE" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "_USRDLL" /D "ICE_API_EXPORTS" /O2 /M$(CECrtMT) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -159,7 +159,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /GR /GX /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "ICE_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /GR /GX /Zi /Od /Gy /I ".." /I "../../include" /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D "UNICODE" /D "_UNICODE" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "_USRDLL" /D "ICEE_API_EXPORTS" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /GR /GX /Zi /Od /Gy /I ".." /I "../../include" /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D "UNICODE" /D "_UNICODE" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "_USRDLL" /D "ICE_API_EXPORTS" /M$(CECrtMTDebug) /c
 # SUBTRACT CPP /YX
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -189,7 +189,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /GR /GX /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /GR /GX /Zi /Od /Gy /I ".." /I "../../include" /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "ICEE_STATIC_LIBS" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /GR /GX /Zi /Od /Gy /I ".." /I "../../include" /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "ICE_STATIC_LIBS" /M$(CECrtMTDebug) /c
 # SUBTRACT CPP /YX
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
@@ -216,7 +216,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /GR /GX /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /GR /GX /Gy /I ".." /I "../../include" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "ICEE_STATIC_LIBS" /O2 /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /GR /GX /Gy /I ".." /I "../../include" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "ICE_STATIC_LIBS" /O2 /M$(CECrtMT) /c
 # SUBTRACT CPP /YX
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
@@ -243,7 +243,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /GR /GX /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
-# ADD CPP /nologo /W3 /GR /GX /Zi /Od /I ".." /I "../../include" /D "DEBUG" /D "_i386_" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "ICEE_STATIC_LIBS" /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /GR /GX /Zi /Od /I ".." /I "../../include" /D "DEBUG" /D "_i386_" /D "_X86_" /D "x86" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "ICE_STATIC_LIBS" /Gs8192 /GF /c
 # SUBTRACT CPP /YX
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
@@ -270,7 +270,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /GR /GX /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /O2 /c
-# ADD CPP /nologo /W3 /GR /GX /I ".." /I "../../include" /D "_i386_" /D "_X86_" /D "x86" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "ICEE_STATIC_LIBS" /Gs8192 /GF /O2 /c
+# ADD CPP /nologo /W3 /GR /GX /I ".." /I "../../include" /D "_i386_" /D "_X86_" /D "x86" /D "NDEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /D "ICE_STATIC_LIBS" /Gs8192 /GF /O2 /c
 # SUBTRACT CPP /YX
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
@@ -36933,7 +36933,7 @@ SOURCE="..\..\slice\IceE\BuiltinSequences.ice"
 InputPath="..\..\slice\IceE\BuiltinSequences.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -36950,7 +36950,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\BuiltinSequences.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -36967,7 +36967,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\BuiltinSequences.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -36984,7 +36984,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\BuiltinSequences.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -37001,7 +37001,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\BuiltinSequences.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -37018,7 +37018,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\BuiltinSequences.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -37035,7 +37035,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\BuiltinSequences.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -37052,7 +37052,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\BuiltinSequences.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -37076,7 +37076,7 @@ SOURCE="..\..\slice\IceE\FacetMap.ice"
 InputPath="..\..\slice\IceE\FacetMap.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -37093,7 +37093,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\FacetMap.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -37110,7 +37110,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\FacetMap.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -37127,7 +37127,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\FacetMap.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -37144,7 +37144,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\FacetMap.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -37161,7 +37161,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\FacetMap.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -37178,7 +37178,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\FacetMap.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -37195,7 +37195,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\FacetMap.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -37219,7 +37219,7 @@ SOURCE="..\..\slice\IceE\Identity.ice"
 InputPath="..\..\slice\IceE\Identity.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -37236,7 +37236,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Identity.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -37253,7 +37253,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Identity.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -37270,7 +37270,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Identity.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -37287,7 +37287,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Identity.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -37304,7 +37304,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Identity.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -37321,7 +37321,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Identity.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -37338,7 +37338,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Identity.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -37362,7 +37362,7 @@ SOURCE="..\..\slice\IceE\Locator.ice"
 InputPath="..\..\slice\IceE\Locator.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -37379,7 +37379,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Locator.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -37396,7 +37396,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Locator.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -37413,7 +37413,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Locator.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -37430,7 +37430,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Locator.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -37447,7 +37447,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Locator.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -37464,7 +37464,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Locator.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -37481,7 +37481,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Locator.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -37505,7 +37505,7 @@ SOURCE="..\..\slice\IceE\LocatorF.ice"
 InputPath="..\..\slice\IceE\LocatorF.ice"
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -37516,7 +37516,7 @@ InputPath="..\..\slice\IceE\LocatorF.ice"
 InputPath="..\..\slice\IceE\LocatorF.ice"
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -37527,7 +37527,7 @@ InputPath="..\..\slice\IceE\LocatorF.ice"
 InputPath="..\..\slice\IceE\LocatorF.ice"
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -37538,7 +37538,7 @@ InputPath="..\..\slice\IceE\LocatorF.ice"
 InputPath="..\..\slice\IceE\LocatorF.ice"
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -37549,7 +37549,7 @@ InputPath="..\..\slice\IceE\LocatorF.ice"
 InputPath="..\..\slice\IceE\LocatorF.ice"
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -37560,7 +37560,7 @@ InputPath="..\..\slice\IceE\LocatorF.ice"
 InputPath="..\..\slice\IceE\LocatorF.ice"
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -37571,7 +37571,7 @@ InputPath="..\..\slice\IceE\LocatorF.ice"
 InputPath="..\..\slice\IceE\LocatorF.ice"
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -37582,7 +37582,7 @@ InputPath="..\..\slice\IceE\LocatorF.ice"
 InputPath="..\..\slice\IceE\LocatorF.ice"
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -37600,7 +37600,7 @@ SOURCE="..\..\slice\IceE\Logger.ice"
 InputPath="..\..\slice\IceE\Logger.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -37617,7 +37617,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Logger.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -37634,7 +37634,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Logger.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -37651,7 +37651,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Logger.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -37668,7 +37668,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Logger.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -37685,7 +37685,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Logger.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -37702,7 +37702,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Logger.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -37719,7 +37719,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Logger.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -37743,7 +37743,7 @@ SOURCE="..\..\slice\IceE\LoggerF.ice"
 InputPath="..\..\slice\IceE\LoggerF.ice"
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -37755,7 +37755,7 @@ InputPath="..\..\slice\IceE\LoggerF.ice"
 InputPath="..\..\slice\IceE\LoggerF.ice"
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -37767,7 +37767,7 @@ InputPath="..\..\slice\IceE\LoggerF.ice"
 InputPath="..\..\slice\IceE\LoggerF.ice"
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -37779,7 +37779,7 @@ InputPath="..\..\slice\IceE\LoggerF.ice"
 InputPath="..\..\slice\IceE\LoggerF.ice"
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -37791,7 +37791,7 @@ InputPath="..\..\slice\IceE\LoggerF.ice"
 InputPath="..\..\slice\IceE\LoggerF.ice"
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -37803,7 +37803,7 @@ InputPath="..\..\slice\IceE\LoggerF.ice"
 InputPath="..\..\slice\IceE\LoggerF.ice"
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -37815,7 +37815,7 @@ InputPath="..\..\slice\IceE\LoggerF.ice"
 InputPath="..\..\slice\IceE\LoggerF.ice"
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -37827,7 +37827,7 @@ InputPath="..\..\slice\IceE\LoggerF.ice"
 InputPath="..\..\slice\IceE\LoggerF.ice"
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -37846,7 +37846,7 @@ SOURCE="..\..\slice\IceE\Router.ice"
 InputPath="..\..\slice\IceE\Router.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -37863,7 +37863,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Router.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -37880,7 +37880,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Router.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -37897,7 +37897,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Router.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -37914,7 +37914,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Router.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -37931,7 +37931,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Router.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -37948,7 +37948,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Router.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -37965,7 +37965,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Router.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -37989,7 +37989,7 @@ SOURCE="..\..\slice\IceE\RouterF.ice"
 InputPath="..\..\slice\IceE\RouterF.ice"
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -38001,7 +38001,7 @@ InputPath="..\..\slice\IceE\RouterF.ice"
 InputPath="..\..\slice\IceE\RouterF.ice"
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -38013,7 +38013,7 @@ InputPath="..\..\slice\IceE\RouterF.ice"
 InputPath="..\..\slice\IceE\RouterF.ice"
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -38025,7 +38025,7 @@ InputPath="..\..\slice\IceE\RouterF.ice"
 InputPath="..\..\slice\IceE\RouterF.ice"
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -38037,7 +38037,7 @@ InputPath="..\..\slice\IceE\RouterF.ice"
 InputPath="..\..\slice\IceE\RouterF.ice"
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -38049,7 +38049,7 @@ InputPath="..\..\slice\IceE\RouterF.ice"
 InputPath="..\..\slice\IceE\RouterF.ice"
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -38061,7 +38061,7 @@ InputPath="..\..\slice\IceE\RouterF.ice"
 InputPath="..\..\slice\IceE\RouterF.ice"
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -38073,7 +38073,7 @@ InputPath="..\..\slice\IceE\RouterF.ice"
 InputPath="..\..\slice\IceE\RouterF.ice"
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
diff --git a/cppe/src/IceEC/Makefile b/cppe/src/IceEC/Makefile
index e67e95489b0..af936c3d52e 100644
--- a/cppe/src/IceEC/Makefile
+++ b/cppe/src/IceEC/Makefile
@@ -114,8 +114,8 @@ endif
 %.o: $(ICE_DIR)/%.cpp
 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $<
 
-CPPFLAGS	:= -I.. $(CPPFLAGS) -DICEE_API_EXPORTS -DICEE_PURE_CLIENT
-SLICE2CPPEFLAGS	:= --ice --include-dir IceE --dll-export ICEE_API $(SLICE2CPPEFLAGS)
+CPPFLAGS	:= -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DICEE_PURE_CLIENT
+SLICE2CPPEFLAGS	:= --ice --include-dir IceE --dll-export ICE_API $(SLICE2CPPEFLAGS)
 
 LINKWITH        := $(ICE_OS_LIBS)
 
diff --git a/cppe/src/IceEC/icec.dsp b/cppe/src/IceEC/icec.dsp
index 751b59bcc95..decd927947f 100755
--- a/cppe/src/IceEC/icec.dsp
+++ b/cppe/src/IceEC/icec.dsp
@@ -45,7 +45,7 @@ CFG=icec - Win32 Debug
 SLICE2CPPEFLAGS=-DICEE
 CPP=cl.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "_USRDLL" /D "ICEE_API_EXPORTS" /D "ICEE_PROTOCOL_API_EXPORTS" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "_USRDLL" /D "ICE_API_EXPORTS" /D "ICE_PROTOCOL_API_EXPORTS" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICE_PURE_CLIENT" /FD /c
 # SUBTRACT CPP /Fr /YX
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
@@ -82,7 +82,7 @@ PostBuild_Cmds=copy $(OutDir)\iceec.lib ..\..\lib\	copy $(OutDir)\iceec10.dll ..
 SLICE2CPPEFLAGS=-DICEE
 CPP=cl.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_USRDLL" /D "LIBRARY_EXPORTS" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "_USRDLL" /D "ICEE_API_EXPORTS" /D "ICEE_PROTOCOL_API_EXPORTS" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "_USRDLL" /D "ICE_API_EXPORTS" /D "ICE_PROTOCOL_API_EXPORTS" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICE_PURE_CLIENT" /FD /GZ /c
 # SUBTRACT CPP /Fr /YX
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
@@ -120,7 +120,7 @@ MTL=midl.exe
 SLICE2CPPEFLAGS=-DICEE
 CPP=cl.exe
 # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /c
-# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /c
+# ADD CPP /nologo /MD /W3 /WX /GR /GX /O1 /I ".." /I "../../include" /D "NDEBUG" /D "ICE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICE_PURE_CLIENT" /FD /c
 # SUBTRACT CPP /Fr /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "NDEBUG"
@@ -153,7 +153,7 @@ MTL=midl.exe
 SLICE2CPPEFLAGS=-DICEE
 CPP=cl.exe
 # ADD BASE CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "_LIB" /Yu"stdafx.h" /FD /GZ /c
-# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "ICEE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICEE_PURE_CLIENT" /FD /GZ /c
+# ADD CPP /nologo /MDd /W3 /WX /Gm /GR /GX /Zi /Od /I ".." /I "../../include" /D "_DEBUG" /D "ICE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICE_PURE_CLIENT" /FD /GZ /c
 # SUBTRACT CPP /Fr /YX
 RSC=rc.exe
 # ADD BASE RSC /l 0x409 /d "_DEBUG"
@@ -762,7 +762,7 @@ SOURCE=..\..\slice\IceE\BuiltinSequences.ice
 InputPath=..\..\slice\IceE\BuiltinSequences.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -779,7 +779,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\BuiltinSequences.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -796,7 +796,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\BuiltinSequences.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -813,7 +813,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\BuiltinSequences.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -837,7 +837,7 @@ SOURCE=..\..\slice\IceE\FacetMap.ice
 InputPath=..\..\slice\IceE\FacetMap.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice  ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice  ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -854,7 +854,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\FacetMap.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice  ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice  ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -871,7 +871,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\FacetMap.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice  ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice  ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -888,7 +888,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\FacetMap.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice  ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice  ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -912,7 +912,7 @@ SOURCE=..\..\slice\IceE\Identity.ice
 InputPath=..\..\slice\IceE\Identity.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -929,7 +929,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Identity.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -946,7 +946,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Identity.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -963,7 +963,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Identity.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -987,7 +987,7 @@ SOURCE=..\..\slice\IceE\Locator.ice
 InputPath=..\..\slice\IceE\Locator.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -1004,7 +1004,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Locator.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -1021,7 +1021,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Locator.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -1038,7 +1038,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Locator.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -1062,7 +1062,7 @@ SOURCE=..\..\slice\IceE\LocatorF.ice
 InputPath=..\..\slice\IceE\LocatorF.ice
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -1073,7 +1073,7 @@ InputPath=..\..\slice\IceE\LocatorF.ice
 InputPath=..\..\slice\IceE\LocatorF.ice
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -1084,7 +1084,7 @@ InputPath=..\..\slice\IceE\LocatorF.ice
 InputPath=..\..\slice\IceE\LocatorF.ice
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -1095,7 +1095,7 @@ InputPath=..\..\slice\IceE\LocatorF.ice
 InputPath=..\..\slice\IceE\LocatorF.ice
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -1113,7 +1113,7 @@ SOURCE=..\..\slice\IceE\Logger.ice
 InputPath=..\..\slice\IceE\Logger.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -1130,7 +1130,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Logger.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -1147,7 +1147,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Logger.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -1164,7 +1164,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Logger.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -1188,7 +1188,7 @@ SOURCE=..\..\slice\IceE\LoggerF.ice
 InputPath=..\..\slice\IceE\LoggerF.ice
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice -DICEE ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice -DICEE ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -1200,7 +1200,7 @@ InputPath=..\..\slice\IceE\LoggerF.ice
 InputPath=..\..\slice\IceE\LoggerF.ice
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice -DICEE ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice -DICEE ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -1212,7 +1212,7 @@ InputPath=..\..\slice\IceE\LoggerF.ice
 InputPath=..\..\slice\IceE\LoggerF.ice
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice -DICEE ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice -DICEE ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -1224,7 +1224,7 @@ InputPath=..\..\slice\IceE\LoggerF.ice
 InputPath=..\..\slice\IceE\LoggerF.ice
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice -DICEE ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice -DICEE ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -1243,7 +1243,7 @@ SOURCE=..\..\slice\IceE\Router.ice
 InputPath=..\..\slice\IceE\Router.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -1260,7 +1260,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Router.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -1277,7 +1277,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Router.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -1294,7 +1294,7 @@ BuildCmds= \
 InputPath=..\..\slice\IceE\Router.ice
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -1318,7 +1318,7 @@ SOURCE=..\..\slice\IceE\RouterF.ice
 InputPath=..\..\slice\IceE\RouterF.ice
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -1330,7 +1330,7 @@ InputPath=..\..\slice\IceE\RouterF.ice
 InputPath=..\..\slice\IceE\RouterF.ice
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -1342,7 +1342,7 @@ InputPath=..\..\slice\IceE\RouterF.ice
 InputPath=..\..\slice\IceE\RouterF.ice
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -1354,7 +1354,7 @@ InputPath=..\..\slice\IceE\RouterF.ice
 InputPath=..\..\slice\IceE\RouterF.ice
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
diff --git a/cppe/src/IceEC/icec.vcp b/cppe/src/IceEC/icec.vcp
index 9a78f34e013..429e4fde9a4 100755
--- a/cppe/src/IceEC/icec.vcp
+++ b/cppe/src/IceEC/icec.vcp
@@ -58,7 +58,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "NDEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_USRDLL" /D "ICE_EXPORTS" /YX /Gs8192 /GF /O2 /c
-# ADD CPP /nologo /W3 /GR /GX /Oxs /I ".." /I "../../include" /D "_i386_" /D "_X86_" /D "x86" /D "NDEBUG" /D "_USRDLL" /D "ICEE_API_EXPORTS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICEE_PURE_CLIENT" /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /GR /GX /Oxs /I ".." /I "../../include" /D "_i386_" /D "_X86_" /D "x86" /D "NDEBUG" /D "_USRDLL" /D "ICE_API_EXPORTS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICE_PURE_CLIENT" /Gs8192 /GF /c
 # SUBTRACT CPP /YX
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -92,7 +92,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "UNICODE" /d "_UNICODE" /d "DEBUG" /d "$(CePlatform)" /d "_X86_" /d "x86" /d "_i386_" /r
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /GR /GX /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_USRDLL" /D "ICE_EXPORTS" /YX /Gs8192 /GF /c
-# ADD CPP /nologo /W3 /GR /GX /Zi /Od /I ".." /I "../../include" /D "DEBUG" /D "_i386_" /D "_X86_" /D "x86" /D "_USRDLL" /D "ICEE_API_EXPORTS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICEE_PURE_CLIENT" /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /GR /GX /Zi /Od /I ".." /I "../../include" /D "DEBUG" /D "_i386_" /D "_X86_" /D "x86" /D "_USRDLL" /D "ICE_API_EXPORTS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICE_PURE_CLIENT" /Gs8192 /GF /c
 # SUBTRACT CPP /YX
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -126,7 +126,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "NDEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "NDEBUG" /D "_USRDLL" /D "ICE_EXPORTS" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /GR /GX /Gy /I ".." /I "../../include" /D "ARM" /D "_ARM_" /D "ARMV4" /D "NDEBUG" /D "_USRDLL" /D "ICEE_API_EXPORTS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICEE_PURE_CLIENT" /O2 /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /GR /GX /Gy /I ".." /I "../../include" /D "ARM" /D "_ARM_" /D "ARMV4" /D "NDEBUG" /D "_USRDLL" /D "ICE_API_EXPORTS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICE_PURE_CLIENT" /O2 /M$(CECrtMT) /c
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o "NUL" /win32
@@ -159,7 +159,7 @@ RSC=rc.exe
 # ADD RSC /l 0x409 /d UNDER_CE=$(CEVersion) /d _WIN32_WCE=$(CEVersion) /d "DEBUG" /d "UNICODE" /d "_UNICODE" /d "$(CePlatform)" /d "ARM" /d "_ARM_" /d "ARMV4" /r
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /GR /GX /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_USRDLL" /D "ICE_EXPORTS" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /GR /GX /Zi /Od /Gy /I ".." /I "../../include" /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D "_USRDLL" /D "ICEE_API_EXPORTS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICEE_PURE_CLIENT" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /GR /GX /Zi /Od /Gy /I ".." /I "../../include" /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D "_USRDLL" /D "ICE_API_EXPORTS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICE_PURE_CLIENT" /M$(CECrtMTDebug) /c
 # SUBTRACT CPP /YX
 MTL=midl.exe
 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o "NUL" /win32
@@ -189,7 +189,7 @@ LINK32=link.exe
 # PROP Target_Dir ""
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /GR /GX /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /M$(CECrtMTDebug) /c
-# ADD CPP /nologo /W3 /GR /GX /Zi /Od /Gy /I ".." /I "../../include" /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D "_LIB" /D "ICEE_STATIC_LIBS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICEE_PURE_CLIENT" /M$(CECrtMTDebug) /c
+# ADD CPP /nologo /W3 /GR /GX /Zi /Od /Gy /I ".." /I "../../include" /D "DEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D "_LIB" /D "ICE_STATIC_LIBS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICE_PURE_CLIENT" /M$(CECrtMTDebug) /c
 # SUBTRACT CPP /YX
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
@@ -216,7 +216,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=clarm.exe
 # ADD BASE CPP /nologo /W3 /GR /GX /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_LIB" /YX /O2 /M$(CECrtMT) /c
-# ADD CPP /nologo /W3 /GR /GX /Gy /I ".." /I "../../include" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D "_LIB" /D "ICEE_STATIC_LIBS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICEE_PURE_CLIENT" /O2 /M$(CECrtMT) /c
+# ADD CPP /nologo /W3 /GR /GX /Gy /I ".." /I "../../include" /D "NDEBUG" /D "ARM" /D "_ARM_" /D "ARMV4" /D "_LIB" /D "ICE_STATIC_LIBS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICE_PURE_CLIENT" /O2 /M$(CECrtMT) /c
 # SUBTRACT CPP /YX
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
@@ -243,7 +243,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /GR /GX /Zi /Od /D "DEBUG" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "_LIB" /YX /Gs8192 /GF /c
-# ADD CPP /nologo /W3 /GR /GX /Zi /Od /I ".." /I "../../include" /D "DEBUG" /D "_i386_" /D "_X86_" /D "x86" /D "_LIB" /D "ICEE_STATIC_LIBS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICEE_PURE_CLIENT" /Gs8192 /GF /c
+# ADD CPP /nologo /W3 /GR /GX /Zi /Od /I ".." /I "../../include" /D "DEBUG" /D "_i386_" /D "_X86_" /D "x86" /D "_LIB" /D "ICE_STATIC_LIBS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICE_PURE_CLIENT" /Gs8192 /GF /c
 # SUBTRACT CPP /YX
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
@@ -270,7 +270,7 @@ BSC32=bscmake.exe
 # PROP Target_Dir ""
 CPP=cl.exe
 # ADD BASE CPP /nologo /W3 /GR /GX /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D "_i386_" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /YX /Gs8192 /GF /O2 /c
-# ADD CPP /nologo /W3 /GR /GX /I ".." /I "../../include" /D "_i386_" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /D "ICEE_STATIC_LIBS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICEE_PURE_CLIENT" /Gs8192 /GF /O2 /c
+# ADD CPP /nologo /W3 /GR /GX /I ".." /I "../../include" /D "_i386_" /D "_X86_" /D "x86" /D "NDEBUG" /D "_LIB" /D "ICE_STATIC_LIBS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICE_PURE_CLIENT" /Gs8192 /GF /O2 /c
 # SUBTRACT CPP /YX
 LIB32=link.exe -lib
 # ADD BASE LIB32 /nologo
@@ -30450,7 +30450,7 @@ SOURCE="..\..\slice\IceE\BuiltinSequences.ice"
 InputPath="..\..\slice\IceE\BuiltinSequences.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -30467,7 +30467,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\BuiltinSequences.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -30484,7 +30484,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\BuiltinSequences.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -30501,7 +30501,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\BuiltinSequences.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -30518,7 +30518,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\BuiltinSequences.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -30535,7 +30535,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\BuiltinSequences.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -30552,7 +30552,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\BuiltinSequences.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -30569,7 +30569,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\BuiltinSequences.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/BuiltinSequences.ice \
 	move BuiltinSequences.h. ..\..\include\icee \
 	
 
@@ -30593,7 +30593,7 @@ SOURCE="..\..\slice\IceE\FacetMap.ice"
 InputPath="..\..\slice\IceE\FacetMap.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -30610,7 +30610,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\FacetMap.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -30627,7 +30627,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\FacetMap.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -30644,7 +30644,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\FacetMap.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -30661,7 +30661,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\FacetMap.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -30678,7 +30678,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\FacetMap.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -30695,7 +30695,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\FacetMap.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -30712,7 +30712,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\FacetMap.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/FacetMap.ice \
 	move FacetMap.h ..\..\include\icee \
 	
 
@@ -30736,7 +30736,7 @@ SOURCE="..\..\slice\IceE\Identity.ice"
 InputPath="..\..\slice\IceE\Identity.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -30753,7 +30753,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Identity.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -30770,7 +30770,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Identity.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -30787,7 +30787,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Identity.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -30804,7 +30804,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Identity.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -30821,7 +30821,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Identity.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -30838,7 +30838,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Identity.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -30855,7 +30855,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Identity.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Identity.ice \
 	move Identity.h ..\..\include\icee \
 	
 
@@ -30879,7 +30879,7 @@ SOURCE="..\..\slice\IceE\Locator.ice"
 InputPath="..\..\slice\IceE\Locator.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -30896,7 +30896,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Locator.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -30913,7 +30913,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Locator.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -30930,7 +30930,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Locator.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -30947,7 +30947,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Locator.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -30964,7 +30964,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Locator.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -30981,7 +30981,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Locator.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -30998,7 +30998,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Locator.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Locator.ice \
 	move Locator.h ..\..\include\icee \
 	
 
@@ -31022,7 +31022,7 @@ SOURCE="..\..\slice\IceE\LocatorF.ice"
 InputPath="..\..\slice\IceE\LocatorF.ice"
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -31033,7 +31033,7 @@ InputPath="..\..\slice\IceE\LocatorF.ice"
 InputPath="..\..\slice\IceE\LocatorF.ice"
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -31044,7 +31044,7 @@ InputPath="..\..\slice\IceE\LocatorF.ice"
 InputPath="..\..\slice\IceE\LocatorF.ice"
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -31055,7 +31055,7 @@ InputPath="..\..\slice\IceE\LocatorF.ice"
 InputPath="..\..\slice\IceE\LocatorF.ice"
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -31066,7 +31066,7 @@ InputPath="..\..\slice\IceE\LocatorF.ice"
 InputPath="..\..\slice\IceE\LocatorF.ice"
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -31077,7 +31077,7 @@ InputPath="..\..\slice\IceE\LocatorF.ice"
 InputPath="..\..\slice\IceE\LocatorF.ice"
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -31088,7 +31088,7 @@ InputPath="..\..\slice\IceE\LocatorF.ice"
 InputPath="..\..\slice\IceE\LocatorF.ice"
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -31099,7 +31099,7 @@ InputPath="..\..\slice\IceE\LocatorF.ice"
 InputPath="..\..\slice\IceE\LocatorF.ice"
 
 "..\..\include\icee\LocatorF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LocatorF.ice 
 	move LocatorF.h ..\..\include\icee 
 	
 # End Custom Build
@@ -31117,7 +31117,7 @@ SOURCE="..\..\slice\IceE\Logger.ice"
 InputPath="..\..\slice\IceE\Logger.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -31134,7 +31134,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Logger.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -31151,7 +31151,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Logger.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -31168,7 +31168,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Logger.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -31185,7 +31185,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Logger.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -31202,7 +31202,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Logger.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -31219,7 +31219,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Logger.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -31236,7 +31236,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Logger.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Logger.ice \
 	move Logger.h ..\..\include\icee \
 	
 
@@ -31260,7 +31260,7 @@ SOURCE="..\..\slice\IceE\LoggerF.ice"
 InputPath="..\..\slice\IceE\LoggerF.ice"
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -31272,7 +31272,7 @@ InputPath="..\..\slice\IceE\LoggerF.ice"
 InputPath="..\..\slice\IceE\LoggerF.ice"
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -31284,7 +31284,7 @@ InputPath="..\..\slice\IceE\LoggerF.ice"
 InputPath="..\..\slice\IceE\LoggerF.ice"
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -31296,7 +31296,7 @@ InputPath="..\..\slice\IceE\LoggerF.ice"
 InputPath="..\..\slice\IceE\LoggerF.ice"
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -31308,7 +31308,7 @@ InputPath="..\..\slice\IceE\LoggerF.ice"
 InputPath="..\..\slice\IceE\LoggerF.ice"
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -31320,7 +31320,7 @@ InputPath="..\..\slice\IceE\LoggerF.ice"
 InputPath="..\..\slice\IceE\LoggerF.ice"
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -31332,7 +31332,7 @@ InputPath="..\..\slice\IceE\LoggerF.ice"
 InputPath="..\..\slice\IceE\LoggerF.ice"
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -31344,7 +31344,7 @@ InputPath="..\..\slice\IceE\LoggerF.ice"
 InputPath="..\..\slice\IceE\LoggerF.ice"
 
 "..\..\include\icee\LoggerF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/LoggerF.ice 
 	move LoggerF.h ..\..\include\icee 
 	del LoggerF.cpp 
 	
@@ -31363,7 +31363,7 @@ SOURCE="..\..\slice\IceE\Router.ice"
 InputPath="..\..\slice\IceE\Router.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -31380,7 +31380,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Router.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -31397,7 +31397,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Router.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -31414,7 +31414,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Router.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -31431,7 +31431,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Router.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -31448,7 +31448,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Router.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -31465,7 +31465,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Router.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -31482,7 +31482,7 @@ BuildCmds= \
 InputPath="..\..\slice\IceE\Router.ice"
 
 BuildCmds= \
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/Router.ice \
 	move Router.h ..\..\include\icee \
 	
 
@@ -31506,7 +31506,7 @@ SOURCE="..\..\slice\IceE\RouterF.ice"
 InputPath="..\..\slice\IceE\RouterF.ice"
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -31518,7 +31518,7 @@ InputPath="..\..\slice\IceE\RouterF.ice"
 InputPath="..\..\slice\IceE\RouterF.ice"
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -31530,7 +31530,7 @@ InputPath="..\..\slice\IceE\RouterF.ice"
 InputPath="..\..\slice\IceE\RouterF.ice"
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -31542,7 +31542,7 @@ InputPath="..\..\slice\IceE\RouterF.ice"
 InputPath="..\..\slice\IceE\RouterF.ice"
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -31554,7 +31554,7 @@ InputPath="..\..\slice\IceE\RouterF.ice"
 InputPath="..\..\slice\IceE\RouterF.ice"
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -31566,7 +31566,7 @@ InputPath="..\..\slice\IceE\RouterF.ice"
 InputPath="..\..\slice\IceE\RouterF.ice"
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -31578,7 +31578,7 @@ InputPath="..\..\slice\IceE\RouterF.ice"
 InputPath="..\..\slice\IceE\RouterF.ice"
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
@@ -31590,7 +31590,7 @@ InputPath="..\..\slice\IceE\RouterF.ice"
 InputPath="..\..\slice\IceE\RouterF.ice"
 
 "..\..\include\icee\RouterF.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
-	slice2cppe.exe --ice --dll-export ICEE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
+	slice2cppe.exe --ice --dll-export ICE_API --include-dir IceE -I../../slice ../../slice/IceE/RouterF.ice 
 	move RouterF.h ..\..\include\icee 
 	del RouterF.cpp 
 	
diff --git a/cppe/src/TcpTransport/TcpEndpoint.cpp b/cppe/src/TcpTransport/TcpEndpoint.cpp
index 22461413606..a0cb56e8f25 100644
--- a/cppe/src/TcpTransport/TcpEndpoint.cpp
+++ b/cppe/src/TcpTransport/TcpEndpoint.cpp
@@ -16,7 +16,7 @@
 #include <IceE/Instance.h>
 #include <IceE/DefaultsAndOverrides.h>
 #include <IceE/SafeStdio.h>
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 #   include <IceE/Acceptor.h>
 #endif
 
@@ -337,7 +337,7 @@ IceInternal::TcpEndpoint::operator<(const Endpoint& r) const
     return false;
 }
 
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
 
 AcceptorPtr
 IceInternal::TcpEndpoint::acceptor(EndpointPtr& endp) const
diff --git a/cppe/src/TcpTransport/TcpEndpoint.h b/cppe/src/TcpTransport/TcpEndpoint.h
index 0880ca794a0..fec9948e6fb 100644
--- a/cppe/src/TcpTransport/TcpEndpoint.h
+++ b/cppe/src/TcpTransport/TcpEndpoint.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICEE_TRANSPORT_TCP_ENDPOINT_H
-#define ICEE_TRANSPORT_TCP_ENDPOINT_H
+#ifndef ICE_TRANSPORT_TCP_ENDPOINT_H
+#define ICE_TRANSPORT_TCP_ENDPOINT_H
 
 #include <IceE/Endpoint.h>
 
@@ -32,11 +32,11 @@ public:
     virtual EndpointPtr timeout(Ice::Int) const;
     virtual bool unknown() const;
     virtual ConnectorPtr connector() const;
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     virtual AcceptorPtr acceptor(EndpointPtr&) const;
 #endif
     virtual bool equivalent(const TransceiverPtr&) const;
-#ifndef ICEE_PURE_CLIENT
+#ifndef ICE_PURE_CLIENT
     virtual bool equivalent(const AcceptorPtr&) const;
 #endif
author	Matthew Newhook <matthew@zeroc.com>	2005-08-12 04:44:58 +0000
committer	Matthew Newhook <matthew@zeroc.com>	2005-08-12 04:44:58 +0000
commit	708d97e4bd4acf9d7c1bad093d0c3847282b09c2 (patch)
tree	f6d6de12f2b778f67d52906c8978578bb278b4e6 /cppe/src
parent	http://bugzilla.zeroc.com/bugzilla/show_bug.cgi?id=439 (diff)
download	ice-708d97e4bd4acf9d7c1bad093d0c3847282b09c2.tar.bz2 ice-708d97e4bd4acf9d7c1bad093d0c3847282b09c2.tar.xz ice-708d97e4bd4acf9d7c1bad093d0c3847282b09c2.zip