Some ICE_ to ICEE_ renamings

57 files changed, 284 insertions, 401 deletions

diff --git a/cppe/src/IceE/Acceptor.h b/cppe/src/IceE/Acceptor.h
index 909ec91dcce..08f5c874f74 100644
--- a/cppe/src/IceE/Acceptor.h
+++ b/cppe/src/IceE/Acceptor.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ACCEPTOR_H
-#define ICE_ACCEPTOR_H
+#ifndef ICEE_ACCEPTOR_H
+#define ICEE_ACCEPTOR_H
 
 #include <IceE/TransceiverF.h>
 #include <IceE/InstanceF.h>
diff --git a/cppe/src/IceE/AcceptorF.h b/cppe/src/IceE/AcceptorF.h
index 1bc9cbe9784..a4e2c3edad0 100644
--- a/cppe/src/IceE/AcceptorF.h
+++ b/cppe/src/IceE/AcceptorF.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ACCEPTOR_F_H
-#define ICE_ACCEPTOR_F_H
+#ifndef ICEE_ACCEPTOR_F_H
+#define ICEE_ACCEPTOR_F_H
 
 #include <IceE/Handle.h>
 
diff --git a/cppe/src/IceE/Communicator.cpp b/cppe/src/IceE/Communicator.cpp
index ffcfe8535a1..6101ab82c61 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 ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 #   include <IceE/ObjectAdapterFactory.h>
 #endif
 
@@ -57,7 +57,7 @@ Ice::Communicator::destroy()
     }
 }
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 
 void
 Ice::Communicator::shutdown()
@@ -126,7 +126,7 @@ Ice::Communicator::proxyToString(const ObjectPrx& proxy) const
     return _instance->proxyFactory()->proxyToString(proxy);
 }
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 
 ObjectAdapterPtr
 Ice::Communicator::createObjectAdapter(const string& name)
@@ -205,7 +205,7 @@ Ice::Communicator::setLogger(const LoggerPtr& logger)
     _instance->logger(logger);
 }
 
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 
 RouterPrx
 Ice::Communicator::getDefaultRouter() const
@@ -231,7 +231,7 @@ Ice::Communicator::setDefaultRouter(const RouterPrx& router)
 
 #endif
 
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 
 LocatorPrx
 Ice::Communicator::getDefaultLocator() const
@@ -257,7 +257,7 @@ Ice::Communicator::setDefaultLocator(const LocatorPrx& locator)
 
 #endif
 
-#ifdef ICE_HAS_BATCH
+#ifdef ICEE_HAS_BATCH
 
 void
 Ice::Communicator::flushBatchRequests()
diff --git a/cppe/src/IceE/Connection.cpp b/cppe/src/IceE/Connection.cpp
index 6536ead4b05..013cac3fb93 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 ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 #   include <IceE/ObjectAdapter.h>
 #   include <IceE/Incoming.h>
 #endif
@@ -69,7 +69,7 @@ Ice::Connection::waitForValidation()
     }
 }
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 void
 Ice::Connection::activate()
 {
@@ -92,7 +92,7 @@ Ice::Connection::destroy(DestructionReason reason)
 
     switch(reason)
     {
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 	case ObjectAdapterDeactivated:
 	{
 	    setState(StateClosing, ObjectAdapterDeactivatedException(__FILE__, __LINE__));
@@ -171,7 +171,7 @@ Ice::Connection::isFinished() const
     return true;
 }
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 
 void
 Ice::Connection::waitUntilHolding() const
@@ -387,7 +387,7 @@ Ice::Connection::sendRequest(BasicStream* os, Outgoing* out)
     }
 }
 
-#ifdef ICE_HAS_BATCH
+#ifdef ICEE_HAS_BATCH
 
 void
 Ice::Connection::prepareBatchRequest(BasicStream* os)
@@ -572,7 +572,7 @@ Ice::Connection::flushBatchRequests()
 
 #endif
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 
 void
 Ice::Connection::sendResponse(BasicStream* os)
@@ -665,7 +665,7 @@ Ice::Connection::endpoint() const
     return _endpoint; // No mutex protection necessary, _endpoint is immutable.
 }
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_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 ICE_PURE_CLIENT
+#ifndef ICEE_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 ICE_PURE_CLIENT
+#ifndef ICEE_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 ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
     _replyHdr(headerSize, 0),
 #endif
     _nextRequestId(1),
     _requestsHint(_requests.end()),
-#ifdef ICE_HAS_BATCH
+#ifdef ICEE_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 ICE_HAS_BATCH
+#ifdef ICEE_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 ICE_PURE_CLIENT
+#ifndef ICEE_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 ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
     bool active;
 
     {
@@ -917,7 +917,7 @@ Ice::Connection::validate()
     	    timeout = _endpoint->timeout();
         }
         
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
         if(active)
         {
     	    BasicStream os(_instance.get());
@@ -1015,7 +1015,7 @@ Ice::Connection::validate()
         _exception->ice_throw();
     }
 
-#ifdef ICE_PURE_CLIENT
+#ifdef ICEE_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 ICE_PURE_CLIENT
+#ifndef ICEE_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 ICE_PURE_CLIENT
+#ifdef ICEE_PURE_CLIENT
 	    if(_state != StateNotValidated)
 	    {
 		return;
@@ -1129,7 +1129,7 @@ Ice::Connection::setState(State state)
 	    break;
 	}
 	
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 	case StateHolding:
 	{
 	    //
@@ -1228,7 +1228,7 @@ Ice::Connection::initiateShutdown() const
 
 void
 Ice::Connection::parseMessage(BasicStream& stream, Int& requestId
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 			      ,Int& invokeNum, ServantManagerPtr& servantManager, ObjectAdapterPtr& adapter
 #endif
 )
@@ -1266,7 +1266,7 @@ Ice::Connection::parseMessage(BasicStream& stream, Int& requestId
 		break;
 	    }
 	
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 	    case requestMsg:
 	    {
 		if(_state == StateClosing)
@@ -1383,7 +1383,7 @@ Ice::Connection::parseMessage(BasicStream& stream, Int& requestId
     }
 }
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_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 ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 	Int invokeNum = 0;
 	ServantManagerPtr servantManager;
 	ObjectAdapterPtr adapter;
@@ -1612,7 +1612,7 @@ Ice::Connection::run()
 	{
 	    IceUtil::Monitor<IceUtil::Mutex>::Lock sync(*this);
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 	    while(_state == StateHolding)
 	    {
 		wait();
@@ -1620,7 +1620,7 @@ Ice::Connection::run()
 #endif
 	    if(_state != StateClosed)
 	    {
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_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 ICE_PURE_CLIENT
+#ifndef ICEE_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 adb21b0197f..0f291e0e202 100755
--- a/cppe/src/IceE/Connector.h
+++ b/cppe/src/IceE/Connector.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_CONNECTOR_H
-#define ICE_CONNECTOR_H
+#ifndef ICEE_CONNECTOR_H
+#define ICEE_CONNECTOR_H
 
 #include <IceE/ConnectorF.h>
 #include <IceE/TransceiverF.h>
diff --git a/cppe/src/IceE/ConnectorF.h b/cppe/src/IceE/ConnectorF.h
index 83646738af7..f3ecbc82ef0 100644
--- a/cppe/src/IceE/ConnectorF.h
+++ b/cppe/src/IceE/ConnectorF.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_CONNECTOR_F_H
-#define ICE_CONNECTOR_F_H
+#ifndef ICEE_CONNECTOR_F_H
+#define ICEE_CONNECTOR_F_H
 
 #include <IceE/Handle.h>
 
diff --git a/cppe/src/IceE/DefaultsAndOverrides.cpp b/cppe/src/IceE/DefaultsAndOverrides.cpp
index ee6df67c5da..9364971bec8 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 ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_LOCATOR
+#ifdef ICEE_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 98a86e8bb3f..853cfdb96e2 100644
--- a/cppe/src/IceE/DefaultsAndOverrides.h
+++ b/cppe/src/IceE/DefaultsAndOverrides.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_DEFAULTS_AND_OVERRIDES_H
-#define ICE_DEFAULTS_AND_OVERRIDES_H
+#ifndef ICEE_DEFAULTS_AND_OVERRIDES_H
+#define ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
     std::string defaultRouter;
 #endif
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     std::string defaultLocator;
 #endif
 
diff --git a/cppe/src/IceE/DefaultsAndOverridesF.h b/cppe/src/IceE/DefaultsAndOverridesF.h
index 05f725f4712..cdac8655c5f 100644
--- a/cppe/src/IceE/DefaultsAndOverridesF.h
+++ b/cppe/src/IceE/DefaultsAndOverridesF.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_DEFAULTS_AND_OVERRIDES_F_H
-#define ICE_DEFAULTS_AND_OVERRIDES_F_H
+#ifndef ICEE_DEFAULTS_AND_OVERRIDES_F_H
+#define ICEE_DEFAULTS_AND_OVERRIDES_F_H
 
 #include <IceE/Handle.h>
 
diff --git a/cppe/src/IceE/Endpoint.h b/cppe/src/IceE/Endpoint.h
index 354fe392de1..3df8d59b8eb 100644
--- a/cppe/src/IceE/Endpoint.h
+++ b/cppe/src/IceE/Endpoint.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ENDPOINT_H
-#define ICE_ENDPOINT_H
+#ifndef ICEE_ENDPOINT_H
+#define ICEE_ENDPOINT_H
 
 #include <IceE/EndpointF.h>
 #include <IceE/ConnectorF.h>
@@ -16,7 +16,7 @@
 #include <IceE/InstanceF.h>
 #include <IceE/LoggerF.h>
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 #   include <IceE/AcceptorF.h>
 #endif
 
@@ -77,7 +77,7 @@ public:
     // from this endpoint, for example, if a dynamic port number is
     // assigned.
     //
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_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 ICE_PURE_CLIENT
+#ifndef ICEE_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 89579ca61af..e816f71ea0f 100644
--- a/cppe/src/IceE/EndpointFactory.h
+++ b/cppe/src/IceE/EndpointFactory.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ENDPOINT_FACTORY_H
-#define ICE_ENDPOINT_FACTORY_H
+#ifndef ICEE_ENDPOINT_FACTORY_H
+#define ICEE_ENDPOINT_FACTORY_H
 
 #include <IceE/EndpointFactoryF.h>
 #include <IceE/EndpointF.h>
diff --git a/cppe/src/IceE/EndpointFactoryF.h b/cppe/src/IceE/EndpointFactoryF.h
index 0143fc0164e..bb697610936 100644
--- a/cppe/src/IceE/EndpointFactoryF.h
+++ b/cppe/src/IceE/EndpointFactoryF.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ENDPOINT_FACTORY_F_H
-#define ICE_ENDPOINT_FACTORY_F_H
+#ifndef ICEE_ENDPOINT_FACTORY_F_H
+#define ICEE_ENDPOINT_FACTORY_F_H
 
 #include <IceE/Handle.h>
 
diff --git a/cppe/src/IceE/IceAtomic.c b/cppe/src/IceE/IceAtomic.c
deleted file mode 100644
index 0d1e94a4483..00000000000
--- a/cppe/src/IceE/IceAtomic.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* ==Id: atomic.S,v 1.4 2001/11/18 00:12:56 davem Exp ==
- * atomic.S: These things are too big to do inline.
- *
- * Copyright (C) 1999 David S. Miller (davem@redhat.com)
- */
-
-/* Recreated as
- * $Id$
- * for use with -Ice-.
- *
- * Build with
- * gcc -shared -o libIceAtomic.so -mcpu=v9 -mtune=v9 IceAtomic.c -fomit-frame-pointer -O2
- * for standalone use, or, better perhaps, as part of libIceUtil.so by
- * gcc         -c                 -mcpu=v9 -mtune=v9 IceAtomic.c -fomit-frame-pointer -O2
- * as part of the src/IceUtil build
- *
-/*  Narrative:
- *  This is the linux kernel code for atomic add, atomic subtract on sparc-v9.  In fact,
- *  although the add/sub routines are typed -void- externally, they actually return
- *  the result of their operation.
- *
- *  The exchange_and_add is like add, except that it returns the original
- *  value of the counter (instead of the new one), and for some reason, the
- *  order of its arguments is reversed.
- *
- *  Here is how I think (all three) work.
- *  do {
- * A.   g5  <- value;
- * B.   g7  <- g5 [+/-] delta;
- * C.   if  (value == g5) swap(g7, value);
- * D.   } while (g5 != g7);     // g5 was original value, g7 is swapped from original value
- *                            // if they are not the same, someone changed the memory
- *                            // copy before the swap, so we start over with a new value
- * E.   Synchronize_memory_and_data_cache;
- * F.   return [value+delta | value - delta | value] depending on add/sub/exchange_add.
- *
- *  Notice that step -C.- is an indivisible operation, so everything is good coming
- *  out.  The entire operation can be retried of between -A.- and start of -C.- someone
- *  else changes the counter variable.  The point is that you get a -coherent- result
- *  (which is to say, you don't operate on a stale counter value, and so replace it
- *  with something wrong for everyone).  You might not be operating on the values
- *  at call.  To do that, put global Mutex around the call itself.
- *
- *  WARNINGS:
- *  Do NOT put these in a header file for inlining.  You will get bus errors,
- *  or the results will be wrong if you don't.
- *
- *  Do NOT use these on Sparc 2, 5, 10, 20 etc.  The instructions are
- *  sparc-version 9.
- *
- * These are written for sparc(v9)-linux-gcc.  I have no idea what they will do
- * with Solaris or with other compilers.
- *
- * I do not know if these work in general; I am not a sparc architect.
- *
- * --
- *  Ferris McCormick <fmccor@inforead.com>
- *  06.iii.03
- */
-
-typedef struct {volatile int counter;} atomic_t;
-
-int __atomic_add(int i, atomic_t* v) {
-    __asm__ __volatile__ (
-"1:	lduw	[%o1], %g5\n"
-"	add	%g5, %o0, %g7\n"
-"	cas	[%o1], %g5, %g7\n"
-"	cmp	%g5, %g7\n"
-"	bne,pn	%icc, 1b\n"
-"	membar	#StoreLoad | #StoreStore\n"
-"	retl\n"
-"	add	%g7, %o0, %o0\n"
-	);
-    return; /* Not Reached */
-}
-
-int __atomic_sub(int i, atomic_t *v) {
-    __asm__ __volatile__ (
-"1:	lduw	[%o1], %g5\n"
-"	sub	%g5, %o0, %g7\n"
-"	cas	[%o1], %g5, %g7\n"
-"	cmp	%g5, %g7\n"
-"	bne,pn	%icc, 1b\n"
-"	 membar	#StoreLoad | #StoreStore\n"
-"	retl\n"
-"	 sub	%g7, %o0, %o0\n"
-	);
-  return; /* Not Reached */
-}
-int __atomic_exchange_and_add(atomic_t *v, int i) {
-#if 0
-        int t2;
-        t2 = v->counter;
-        __atomic_add(i,v);
-        return t2;  /* Of course, this is wrong because counter might change
-	               after the assignment to t2 but before the add */
-#else   /* This is what we actually do */
-        __asm__ __volatile__ (
-"1:     lduw    [%o0], %g5\n"
-"       add     %g5, %o1, %g7\n"
-"       cas     [%o0], %g5, %g7\n"
-"       cmp     %g5, %g7\n"
-"       bne,pn  %icc, 1b\n"
-"       membar  #StoreLoad | #StoreStore\n"
-"       retl\n"
-"       mov     %g7, %o0\n"
-        );
-        return; /* Not Reached */
-#endif
-}
diff --git a/cppe/src/IceE/IncomingConnectionFactory.h b/cppe/src/IceE/IncomingConnectionFactory.h
index 7a302502f26..717af507918 100755
--- a/cppe/src/IceE/IncomingConnectionFactory.h
+++ b/cppe/src/IceE/IncomingConnectionFactory.h
@@ -8,8 +8,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_INCOMING_CONNECTION_FACTORY_H
-#define ICE_INCOMING_CONNECTION_FACTORY_H
+#ifndef ICEE_INCOMING_CONNECTION_FACTORY_H
+#define ICEE_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 ICE_HAS_BATCH
+#ifdef ICEE_HAS_BATCH
     void flushBatchRequests();
 #endif
 
diff --git a/cppe/src/IceE/Initialize.cpp b/cppe/src/IceE/Initialize.cpp
index 269a592a40d..b7a04d8b421 100644
--- a/cppe/src/IceE/Initialize.cpp
+++ b/cppe/src/IceE/Initialize.cpp
@@ -136,7 +136,7 @@ Ice::initializeWithProperties(int& argc, char* argv[], const PropertiesPtr& prop
     //
     // Major and minor version numbers must match.
     //
-    if(ICE_INT_VERSION / 100 != version / 100)
+    if(ICEE_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 > ICE_INT_VERSION % 100)
+    if(version % 100 > ICEE_INT_VERSION % 100)
     {
 	throw VersionMismatchException(__FILE__, __LINE__);
     }
diff --git a/cppe/src/IceE/Instance.cpp b/cppe/src/IceE/Instance.cpp
index bf3b203f00c..e9497bff3f7 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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 #    include <IceE/RouterInfo.h>
 #    include <IceE/Router.h>
 #endif
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_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 ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 #    include <IceE/ObjectAdapterFactory.h>
 #endif
 
@@ -110,7 +110,7 @@ IceInternal::Instance::defaultsAndOverrides() const
     return _defaultsAndOverrides;
 }
 
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 
 RouterManagerPtr
 IceInternal::Instance::routerManager() const
@@ -127,7 +127,7 @@ IceInternal::Instance::routerManager() const
 
 #endif
 
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 
 LocatorManagerPtr
 IceInternal::Instance::locatorManager() const
@@ -183,7 +183,7 @@ IceInternal::Instance::outgoingConnectionFactory() const
     return _outgoingConnectionFactory;
 }
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 ObjectAdapterFactoryPtr
 IceInternal::Instance::objectAdapterFactory() const
 {
@@ -225,13 +225,13 @@ IceInternal::Instance::messageSizeMax() const
     return _messageSizeMax;
 }
 
-#ifdef ICE_HAS_BATCH
+#ifdef ICEE_HAS_BATCH
 void
 IceInternal::Instance::flushBatchRequests()
 {
 
     OutgoingConnectionFactoryPtr connectionFactory;
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
     ObjectAdapterFactoryPtr adapterFactory;
 #endif
 
@@ -244,13 +244,13 @@ IceInternal::Instance::flushBatchRequests()
 	}
 
 	connectionFactory = _outgoingConnectionFactory;
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 	adapterFactory = _objectAdapterFactory;
 #endif
     }
 
     connectionFactory->flushBatchRequests();
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 	_routerManager = new RouterManager;
 #endif
 
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 	_locatorManager = new LocatorManager;
 #endif
 
@@ -446,7 +446,7 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope
 
 	_outgoingConnectionFactory = new OutgoingConnectionFactory(this);
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 	_objectAdapterFactory = new ObjectAdapterFactory(this, communicator);
 #endif
 
@@ -470,13 +470,13 @@ IceInternal::Instance::~Instance()
     assert(!_referenceFactory);
     assert(!_proxyFactory);
     assert(!_outgoingConnectionFactory);
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
     assert(!_objectAdapterFactory);
 #endif
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
     assert(!_routerManager);
 #endif
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
     if(!_defaultsAndOverrides->defaultRouter.empty())
     {
 	_referenceFactory->setDefaultRouter(
@@ -514,7 +514,7 @@ IceInternal::Instance::finishSetup(int& argc, char* argv[])
     }
 #endif
 
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     if(!_defaultsAndOverrides->defaultLocator.empty())
     {
 	_referenceFactory->setDefaultLocator(
@@ -558,7 +558,7 @@ IceInternal::Instance::destroy()
 {
     assert(!_destroyed);
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
     if(_objectAdapterFactory)
     {
         _objectAdapterFactory->shutdown();	
@@ -589,7 +589,7 @@ IceInternal::Instance::destroy()
     {
 	IceUtil::RecMutex::Lock sync(*this);
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 	_objectAdapterFactory = 0;
 #endif
 	_outgoingConnectionFactory = 0;
@@ -604,7 +604,7 @@ IceInternal::Instance::destroy()
 	// _proxyFactory->destroy();
 	_proxyFactory = 0;
 	
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 	if(_routerManager)
 	{
 	    _routerManager->destroy();
@@ -612,7 +612,7 @@ IceInternal::Instance::destroy()
 	}
 #endif
 
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 	if(_locatorManager)
 	{
 	    _locatorManager->destroy();
diff --git a/cppe/src/IceE/Instance.h b/cppe/src/IceE/Instance.h
index d3bfc6f9805..7826e8d6819 100644
--- a/cppe/src/IceE/Instance.h
+++ b/cppe/src/IceE/Instance.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_INSTANCE_H
-#define ICE_INSTANCE_H
+#ifndef ICEE_INSTANCE_H
+#define ICEE_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 ICE_PURE_CLIENT
+#ifndef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
     RouterManagerPtr routerManager() const;
 #endif
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_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 ICE_HAS_BATCH
+#ifdef ICEE_HAS_BATCH
     void flushBatchRequests();
 #endif
     void setDefaultContext(const ::Ice::Context&);
     const ::Ice::Context& getDefaultContext() const;
     size_t threadPerConnectionStackSize() const;
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
     RouterManagerPtr _routerManager;
 #endif
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     LocatorManagerPtr _locatorManager;
 #endif
     ReferenceFactoryPtr _referenceFactory;
@@ -93,7 +93,7 @@ private:
     EndpointFactoryPtr _endpointFactory;
     Ice::Context _defaultContext;
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
     ObjectAdapterFactoryPtr _objectAdapterFactory;
 #endif
 };
diff --git a/cppe/src/IceE/LocalException.cpp b/cppe/src/IceE/LocalException.cpp
index 63f047b867d..236ca498ca3 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 ICE_PURE_CLIENT
+#ifndef ICEE_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 ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     string out = Exception::toString();
     out += ":\nobject adapter with id `";
     out += id; 
@@ -445,7 +445,7 @@ Ice::ObjectAdapterIdInUseException::toString() const
 #endif
 }
 
-#endif // ICE_PURE_CLIENT
+#endif // ICEE_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 5d86bf1d01b..3539fc9e7af 100644
--- a/cppe/src/IceE/LocatorInfo.cpp
+++ b/cppe/src/IceE/LocatorInfo.cpp
@@ -9,7 +9,7 @@
 
 #include <IceE/Config.h>
 
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_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 32706929b9d..b5c94c66991 100644
--- a/cppe/src/IceE/LocatorInfo.h
+++ b/cppe/src/IceE/LocatorInfo.h
@@ -7,12 +7,12 @@
 //
 // **********************************************************************
 
-#ifndef ICE_LOCATOR_INFO_H
-#define ICE_LOCATOR_INFO_H
+#ifndef ICEE_LOCATOR_INFO_H
+#define ICEE_LOCATOR_INFO_H
 
 #include <IceE/Config.h>
 
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_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 f4c3d49188f..575706ef4e2 100644
--- a/cppe/src/IceE/LoggerI.h
+++ b/cppe/src/IceE/LoggerI.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_LOGGER_I_H
-#define ICE_LOGGER_I_H
+#ifndef ICEE_LOGGER_I_H
+#define ICEE_LOGGER_I_H
 
 #include <IceE/Logger.h>
 #include <IceE/Mutex.h>
diff --git a/cppe/src/IceE/Makefile b/cppe/src/IceE/Makefile
index b4154981058..42e8b4ec686 100644
--- a/cppe/src/IceE/Makefile
+++ b/cppe/src/IceE/Makefile
@@ -109,13 +109,6 @@ HDIR		= $(includedir)/IceE
 SDIR		= $(slicedir)/IceE
 
 include $(top_srcdir)/config/Make.rules
-ifeq ($(USE_SPARC_ASM),yes)
-ASRC		= 	IceAtomic.c
-AOBJ		= 	IceAtomic.o
-SRCS		:= 	$(SRCS) $(ASRCS)
-OBJS		:= 	$(OBJS) $(AOBJ)
-CFLAGS		:= 	$(CFLAGS) -fomit-frame-pointer
-endif
 
 CPPFLAGS	:= -I.. $(CPPFLAGS) -DICE_API_EXPORTS 
 SLICE2CPPEFLAGS	:= --ice --include-dir IceE --dll-export ICE_API $(SLICE2CPPEFLAGS)
diff --git a/cppe/src/IceE/Network.cpp b/cppe/src/IceE/Network.cpp
index 4d443c7b92e..68815363cc0 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 ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 
 bool
 IceInternal::acceptInterrupted()
diff --git a/cppe/src/IceE/Network.h b/cppe/src/IceE/Network.h
index 6a185764777..efe8320ac72 100644
--- a/cppe/src/IceE/Network.h
+++ b/cppe/src/IceE/Network.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_NETWORK_H
-#define ICE_NETWORK_H
+#ifndef ICEE_NETWORK_H
+#define ICEE_NETWORK_H
 
 #ifdef __hpux
 #   define _XOPEN_SOURCE_EXTENDED
diff --git a/cppe/src/IceE/ObjectAdapter.cpp b/cppe/src/IceE/ObjectAdapter.cpp
index e438a24ace1..93068218ff5 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 ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 #    include <IceE/LocatorInfo.h>
 #    include <IceE/Locator.h>
 #endif
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     LocatorRegistryPrx locatorRegistry;
 #endif
     bool printAdapterReady = false;
@@ -99,7 +99,7 @@ Ice::ObjectAdapter::activate()
 
 	if(!_printAdapterReadyDone)
 	{
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_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 ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     if(locatorRegistry)
     {
 	//
@@ -439,7 +439,7 @@ Ice::ObjectAdapter::createReverseProxy(const Identity& ident) const
     return _instance->proxyFactory()->referenceToProxy(ref);
 }
 
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 void
 Ice::ObjectAdapter::addRouter(const RouterPrx& router)
 {
@@ -477,7 +477,7 @@ Ice::ObjectAdapter::addRouter(const RouterPrx& router)
 }
 #endif
 
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_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 ICE_HAS_LOCATOR
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_LOCATOR
+#ifdef ICEE_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 ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     if(_id.empty())
     {
 #endif
 	return newDirectProxy(ident, facet);
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     }
     else
     {
 	//
 	// Create a reference with the adapter id.
 	//
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
     copy(_routerEndpoints.begin(), _routerEndpoints.end(), back_inserter(endpoints));
 #endif
     
     //
     // Create a reference and return a proxy for this reference.
     //
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_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 57be9e3fb85..eb91ec4ed9e 100644
--- a/cppe/src/IceE/ObjectAdapterFactory.h
+++ b/cppe/src/IceE/ObjectAdapterFactory.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_OBJECT_ADAPTER_FACTORY_H
-#define ICE_OBJECT_ADAPTER_FACTORY_H
+#ifndef ICEE_OBJECT_ADAPTER_FACTORY_H
+#define ICEE_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 c4ff162556c..e840ac2df25 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 ICE_HAS_BATCH
+#ifdef ICEE_HAS_BATCH
 	case Reference::ModeBatchOneway:
 	{
 	    _connection->prepareBatchRequest(&_os);
@@ -236,7 +236,7 @@ IceInternal::Outgoing::invoke()
 	    break;
 	}
 
-#ifdef ICE_HAS_BATCH
+#ifdef ICEE_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 ICE_HAS_BATCH
+#ifdef ICEE_HAS_BATCH
     if(_reference->getMode() == Reference::ModeBatchOneway)
     {
 	_connection->abortBatchRequest();
diff --git a/cppe/src/IceE/OutgoingConnectionFactory.cpp b/cppe/src/IceE/OutgoingConnectionFactory.cpp
index c7056215812..a00d79ec530 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 ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_PURE_CLIENT
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_PURE_CLIENT
+#ifndef ICEE_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 ICE_PURE_CLIENT
+#ifndef ICEE_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 ICE_HAS_BATCH
+#ifdef ICEE_HAS_BATCH
 void
 IceInternal::OutgoingConnectionFactory::flushBatchRequests()
 {
@@ -435,7 +435,7 @@ IceInternal::OutgoingConnectionFactory::~OutgoingConnectionFactory()
     assert(_connections.empty());
 }
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 
 void
 IceInternal::OutgoingConnectionFactory::removeAdapter(const ObjectAdapterPtr& adapter)
diff --git a/cppe/src/IceE/OutgoingConnectionFactory.h b/cppe/src/IceE/OutgoingConnectionFactory.h
index 99fbaf2d8f3..3ca4f72dfdf 100755
--- a/cppe/src/IceE/OutgoingConnectionFactory.h
+++ b/cppe/src/IceE/OutgoingConnectionFactory.h
@@ -7,15 +7,15 @@
 //
 // **********************************************************************
 
-#ifndef ICE_OUTGOING_CONNECTION_FACTORY_H
-#define ICE_OUTGOING_CONNECTION_FACTORY_H
+#ifndef ICEE_OUTGOING_CONNECTION_FACTORY_H
+#define ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
     void setRouter(const ::Ice::RouterPrx&);
 #endif
     void removeAdapter(const ::Ice::ObjectAdapterPtr&);
-#ifdef ICE_HAS_BATCH
+#ifdef ICEE_HAS_BATCH
     void flushBatchRequests();
 #endif
 
diff --git a/cppe/src/IceE/Protocol.h b/cppe/src/IceE/Protocol.h
index 9c463ad8286..c1fa7c25d0e 100644
--- a/cppe/src/IceE/Protocol.h
+++ b/cppe/src/IceE/Protocol.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PROTOCOL_H
-#define ICE_PROTOCOL_H
+#ifndef ICEE_PROTOCOL_H
+#define ICEE_PROTOCOL_H
 
 #include <IceE/Config.h>
 
diff --git a/cppe/src/IceE/Proxy.cpp b/cppe/src/IceE/Proxy.cpp
index 0784fe482a8..c10b7718c40 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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 #   include <IceE/RouterInfo.h>
 #endif
 
@@ -298,7 +298,7 @@ IceProxy::Ice::Object::ice_id(const Context& __context)
     }
 }
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_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 ICE_HAS_BATCH
+#ifdef ICEE_HAS_BATCH
 ObjectPrx
 IceProxy::Ice::Object::ice_batchOneway() const
 {
@@ -511,7 +511,7 @@ IceProxy::Ice::Object::ice_timeout(int t) const
     }
 }
 
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_LOCATOR
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_PURE_CLIENT
+#ifndef ICEE_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 815d8ad14c0..a55c3b83233 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 ICE_HAS_LOCATOR
+#ifdef ICEE_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 d4b5f1c16cb..6d953b56227 100644
--- a/cppe/src/IceE/ProxyFactory.h
+++ b/cppe/src/IceE/ProxyFactory.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_PROXY_FACTORY_H
-#define ICE_PROXY_FACTORY_H
+#ifndef ICEE_PROXY_FACTORY_H
+#define ICEE_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 2992a8d3724..e470a334fee 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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 #   include <IceE/RouterInfo.h>
 #   include <IceE/Router.h>
 #   include <IceE/Connection.h>
 #endif
 
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 #   include <IceE/LocatorInfo.h>
 #   include <IceE/Locator.h>
 #endif
@@ -452,7 +452,7 @@ IceInternal::FixedReference::getEndpoints() const
     return vector<EndpointPtr>();
 }
 
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 
 ReferencePtr
 IceInternal::FixedReference::changeRouter(const RouterPrx&) const
@@ -462,7 +462,7 @@ IceInternal::FixedReference::changeRouter(const RouterPrx&) const
 
 #endif
 
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_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 ICE_HAS_BATCH
+#ifndef ICEE_HAS_BATCH
        || getMode() == ModeBatchOneway
 #endif
       )
@@ -526,7 +526,7 @@ IceInternal::FixedReference::getConnection() const
 	{
 	    ex.unsupportedFeature = "batch datagram";
 	}
-#ifndef ICE_HAS_BATCH
+#ifndef ICEE_HAS_BATCH
 	else if(getMode() == ModeBatchOneway)
 	{
 	    ex.unsupportedFeature = "batch";
@@ -599,7 +599,7 @@ IceInternal::FixedReference::FixedReference(const FixedReference& r)
 {
 }
 
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     LocatorPrx loc = getInstance()->referenceFactory()->getDefaultLocator();
     if(loc)
     {
 	LocatorInfoPtr newLocatorInfo = getInstance()->locatorManager()->get(loc);
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 	return getInstance()->referenceFactory()->create(getIdentity(), Context(), "", ModeTwoway, false,
 							 "", 0, newLocatorInfo);
 #else
@@ -757,13 +757,13 @@ IceInternal::DirectReference::changeDefault() const
 #endif
     }
     else
-#endif // ICE_HAS_LOCATOR
+#endif // ICEE_HAS_LOCATOR
     {
 	return Parent::changeDefault();
     }
 }
 
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_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(ICE_HAS_ROUTER) && !defined(ICE_PURE_CLIENT)
+#if defined(ICEE_HAS_ROUTER) && !defined(ICEE_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 ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 
 void IceInternal::incRef(IceInternal::IndirectReference* p) { p->__incRef(); }
 void IceInternal::decRef(IceInternal::IndirectReference* p) { p->__decRef(); }
 
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 	vector<EndpointPtr> endpts = Parent::getRoutedEndpoints();
 #else
 	vector<EndpointPtr> endpts;
@@ -1104,7 +1104,7 @@ IceInternal::IndirectReference::getConnection() const
 	}
 	catch(const LocalException& ex)
 	{
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 	    if(!getRouterInfo())
 #endif
 	    {
@@ -1132,7 +1132,7 @@ IceInternal::IndirectReference::getConnection() const
 	break;
     }
 
-#if defined(ICE_HAS_ROUTER) && !defined(ICE_PURE_CLIENT)
+#if defined(ICEE_HAS_ROUTER) && !defined(ICEE_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 // ICE_HAS_LOCATOR
+#endif // ICEE_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 ICE_HAS_BATCH
+#ifndef ICEE_HAS_BATCH
        || m == Reference::ModeBatchOneway
 #endif
 	)
@@ -1241,7 +1241,7 @@ IceInternal::filterEndpoints(const vector<EndpointPtr>& allEndpoints, Reference:
 	{
 	    ex.unsupportedFeature = "batch datagram";
 	}
-#ifndef ICE_HAS_BATCH
+#ifndef ICEE_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 de55201a092..74c70073adc 100644
--- a/cppe/src/IceE/Reference.h
+++ b/cppe/src/IceE/Reference.h
@@ -7,18 +7,18 @@
 //
 // **********************************************************************
 
-#ifndef ICE_REFERENCE_H
-#define ICE_REFERENCE_H
+#ifndef ICEE_REFERENCE_H
+#define ICEE_REFERENCE_H
 
 #include <IceE/ReferenceF.h>
 #include <IceE/EndpointF.h>
 #include <IceE/InstanceF.h>
 #include <IceE/CommunicatorF.h>
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 #  include <IceE/RouterInfoF.h>
 #  include <IceE/RouterF.h>
 #endif
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 #  include <IceE/LocatorInfoF.h>
 #  include <IceE/LocatorF.h>
 #endif
@@ -75,10 +75,10 @@ public:
     //
     virtual ReferencePtr changeDefault() const;
 
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
     virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const = 0;
 #endif
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
     virtual ReferencePtr changeRouter(const Ice::RouterPrx&) const;
 #endif
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 class RoutableReference : public Reference
 {
 public:
@@ -200,7 +200,7 @@ private:
 #endif
 
 class DirectReference :
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 		    , const RouterInfoPtr&
 #endif
 		    );
@@ -221,7 +221,7 @@ public:
 
     virtual ReferencePtr changeDefault() const;
 
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
     typedef RoutableReference Parent;
 #else
     typedef Reference Parent;
 #endif
 };
 
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 
 class IndirectReference :
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 		      , const RouterInfoPtr&
 #endif
 		      , const LocatorInfoPtr&);
@@ -297,14 +297,14 @@ private:
 
     std::string _adapterId;
     LocatorInfoPtr _locatorInfo;
-#ifdef ICE_HAS_ROUTER

+#ifdef ICEE_HAS_ROUTER

     typedef RoutableReference Parent;

 #else

     typedef Reference Parent;

 #endif

 };
 
-#endif // ICE_HAS_LOCATOR
+#endif // ICEE_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 6a2e0649c66..e958257edeb 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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 #   include <IceE/RouterInfo.h>
 #endif
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 				      , const RouterInfoPtr& routerInfo
 #endif
 				      )
@@ -76,14 +76,14 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
     //
     // Create new reference
     //
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_LOCATOR
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 				      , const RouterInfoPtr& routerInfo
 #endif
 				      , const LocatorInfoPtr& locatorInfo)
@@ -112,7 +112,7 @@ IceInternal::ReferenceFactory::create(const Identity& ident,
     //
     // Create new reference
     //
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
     RouterInfoPtr routerInfo = _instance->routerManager()->get(getDefaultRouter());
 #endif
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     LocatorInfoPtr locatorInfo = _instance->locatorManager()->get(getDefaultLocator());
 #endif
 
     if(beg == string::npos)
     {
-#ifdef ICE_HAS_LOCATOR
-#   ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_LOCATOR
+#   ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_LOCATOR
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_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 ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 	LocatorInfoPtr locatorInfo = _instance->locatorManager()->get(getDefaultLocator());
 	s->read(adapterId);
-#   ifdef ICE_HAS_ROUTER
+#   ifdef ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 
 void
 IceInternal::ReferenceFactory::setDefaultRouter(const RouterPrx& defaultRouter)
@@ -647,7 +647,7 @@ IceInternal::ReferenceFactory::getDefaultRouter() const
 
 #endif
 
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
 
 void
 IceInternal::ReferenceFactory::setDefaultLocator(const LocatorPrx& defaultLocator)
@@ -681,10 +681,10 @@ IceInternal::ReferenceFactory::destroy()
     }
 
     _instance = 0;
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
     _defaultRouter = 0;
 #endif
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     _defaultLocator = 0;
 #endif
 }
diff --git a/cppe/src/IceE/ReferenceFactory.h b/cppe/src/IceE/ReferenceFactory.h
index 36afbbd75e2..d2c4c4482ae 100644
--- a/cppe/src/IceE/ReferenceFactory.h
+++ b/cppe/src/IceE/ReferenceFactory.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_REFERENCE_FACTORY_H
-#define ICE_REFERENCE_FACTORY_H
+#ifndef ICEE_REFERENCE_FACTORY_H
+#define ICEE_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 ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 			, const RouterInfoPtr&
 #endif
 			);
     //
     // Create an indirect reference.
     //
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     ReferencePtr create(const ::Ice::Identity&, const ::Ice::Context&, const ::std::string&,
 			Reference::Mode, bool, const ::std::string&
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 			, const RouterInfoPtr&
 #endif
 			, const LocatorInfoPtr&);
@@ -64,12 +64,12 @@ public:
     //
     ReferencePtr create(const ::Ice::Identity&, BasicStream*);
 
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
     void setDefaultRouter(const ::Ice::RouterPrx&);
     ::Ice::RouterPrx getDefaultRouter() const;
 #endif
 
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     void setDefaultLocator(const ::Ice::LocatorPrx&);
     ::Ice::LocatorPrx getDefaultLocator() const;
 #endif
@@ -81,10 +81,10 @@ private:
     friend class Instance;
 
     InstancePtr _instance;
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
     ::Ice::RouterPrx _defaultRouter;
 #endif
-#ifdef ICE_HAS_LOCATOR
+#ifdef ICEE_HAS_LOCATOR
     ::Ice::LocatorPrx _defaultLocator;
 #endif
 };
diff --git a/cppe/src/IceE/ReferenceFactoryF.h b/cppe/src/IceE/ReferenceFactoryF.h
index 2f95b92861a..2cb59c91bb6 100644
--- a/cppe/src/IceE/ReferenceFactoryF.h
+++ b/cppe/src/IceE/ReferenceFactoryF.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_REFERENCE_FACTORY_F_H
-#define ICE_REFERENCE_FACTORY_F_H
+#ifndef ICEE_REFERENCE_FACTORY_F_H
+#define ICEE_REFERENCE_FACTORY_F_H
 
 #include <IceE/Handle.h>
 
diff --git a/cppe/src/IceE/RouterInfo.cpp b/cppe/src/IceE/RouterInfo.cpp
index 0bf81ed60ac..130166f4e23 100644
--- a/cppe/src/IceE/RouterInfo.cpp
+++ b/cppe/src/IceE/RouterInfo.cpp
@@ -9,7 +9,7 @@
 
 #include <IceE/Config.h>
 
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 
 #include <IceE/RouterInfo.h>
 #include <IceE/Router.h>
@@ -97,7 +97,7 @@ IceInternal::RouterInfo::destroy()
 
     _clientProxy = 0;
     _serverProxy = 0;
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
     _adapter = 0;
 #endif
     _routingTable->clear();
@@ -210,7 +210,7 @@ IceInternal::RouterInfo::addProxy(const ObjectPrx& proxy)
     }
 }
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 void
 IceInternal::RouterInfo::setAdapter(const ObjectAdapterPtr& adapter)
 {
diff --git a/cppe/src/IceE/RouterInfo.h b/cppe/src/IceE/RouterInfo.h
index a9949f75dd9..e641a132943 100644
--- a/cppe/src/IceE/RouterInfo.h
+++ b/cppe/src/IceE/RouterInfo.h
@@ -7,17 +7,17 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ROUTER_INFO_H
-#define ICE_ROUTER_INFO_H
+#ifndef ICEE_ROUTER_INFO_H
+#define ICEE_ROUTER_INFO_H
 
 #include <IceE/Config.h>
 
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 
 #include <IceE/RouterInfoF.h>
 #include <IceE/RouterF.h>
 #include <IceE/RoutingTableF.h>
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_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 ICE_PURE_CLIENT
+#ifndef ICEE_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 ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
     Ice::ObjectAdapterPtr _adapter;
 #endif
 };
diff --git a/cppe/src/IceE/RouterInfoF.h b/cppe/src/IceE/RouterInfoF.h
index 5c5bcd33b80..33f02b33a01 100644
--- a/cppe/src/IceE/RouterInfoF.h
+++ b/cppe/src/IceE/RouterInfoF.h
@@ -7,12 +7,12 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ROUTER_INFO_F_H
-#define ICE_ROUTER_INFO_F_H
+#ifndef ICEE_ROUTER_INFO_F_H
+#define ICEE_ROUTER_INFO_F_H
 
 #include <IceE/Config.h>
 
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_HAS_ROUTER
 
 #include <IceE/Handle.h>
 
diff --git a/cppe/src/IceE/RoutingTable.cpp b/cppe/src/IceE/RoutingTable.cpp
index ffc5f925849..fb6900f571b 100644
--- a/cppe/src/IceE/RoutingTable.cpp
+++ b/cppe/src/IceE/RoutingTable.cpp
@@ -9,7 +9,7 @@
 
 #include <IceE/Config.h>
 
-#ifdef ICE_HAS_ROUTER
+#ifdef ICEE_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 4069ca01efd..744aaa7da62 100644
--- a/cppe/src/IceE/RoutingTable.h
+++ b/cppe/src/IceE/RoutingTable.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ROUTING_TABLE_H
-#define ICE_ROUTING_TABLE_H
+#ifndef ICEE_ROUTING_TABLE_H
+#define ICEE_ROUTING_TABLE_H
 
 #include <IceE/RoutingTableF.h>
 #include <IceE/ProxyF.h>
diff --git a/cppe/src/IceE/RoutingTableF.h b/cppe/src/IceE/RoutingTableF.h
index e5f97cfd329..0a923fdb40e 100644
--- a/cppe/src/IceE/RoutingTableF.h
+++ b/cppe/src/IceE/RoutingTableF.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_ROUTING_TABLE_F_H
-#define ICE_ROUTING_TABLE_F_H
+#ifndef ICEE_ROUTING_TABLE_F_H
+#define ICEE_ROUTING_TABLE_F_H
 
 #include <IceE/Handle.h>
 
diff --git a/cppe/src/IceE/ServantManager.h b/cppe/src/IceE/ServantManager.h
index e0664cd899d..5ff025bf3cb 100644
--- a/cppe/src/IceE/ServantManager.h
+++ b/cppe/src/IceE/ServantManager.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_SERVANT_MANAGER_H
-#define ICE_SERVANT_MANAGER_H
+#ifndef ICEE_SERVANT_MANAGER_H
+#define ICEE_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 86925417f7d..55a189114c8 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 ICE_HAS_ATOMIC_FUNCTIONS
+#ifndef ICEE_HAS_ATOMIC_FUNCTIONS
     _ref(0),
 #endif
     _noDelete(false)
 {
-#ifdef ICE_HAS_ATOMIC_FUNCTIONS
+#ifdef ICEE_HAS_ATOMIC_FUNCTIONS
     ice_atomic_set(&_ref, 0);
 #endif
 }
 
 IceUtil::Shared::Shared(const Shared&) :
-#ifndef ICE_HAS_ATOMIC_FUNCTIONS
+#ifndef ICEE_HAS_ATOMIC_FUNCTIONS
     _ref(0),
 #endif
     _noDelete(false)
 {
-#ifdef ICE_HAS_ATOMIC_FUNCTIONS
+#ifdef ICEE_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(ICE_HAS_ATOMIC_FUNCTIONS)
+#elif defined(ICEE_HAS_ATOMIC_FUNCTIONS)
     return ice_atomic_exchange_add(0, const_cast<ice_atomic_t*>(&_ref));
 #else
     _mutex.lock();
diff --git a/cppe/src/IceE/TraceLevels.h b/cppe/src/IceE/TraceLevels.h
index 762c7afe31d..c7a89b798b4 100644
--- a/cppe/src/IceE/TraceLevels.h
+++ b/cppe/src/IceE/TraceLevels.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_TRACE_LEVELS_H
-#define ICE_TRACE_LEVELS_H
+#ifndef ICEE_TRACE_LEVELS_H
+#define ICEE_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 7509cc99d11..bd2aa5f493d 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 ICE_HAS_BATCH
+#ifdef ICEE_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 3701f46c94a..276030a9f79 100644
--- a/cppe/src/IceE/TraceUtil.h
+++ b/cppe/src/IceE/TraceUtil.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_TRACE_UTIL_H
-#define ICE_TRACE_UTIL_H
+#ifndef ICEE_TRACE_UTIL_H
+#define ICEE_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 ICE_HAS_BATCH
+#ifdef ICEE_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 06612fdd095..34b0f89f079 100644
--- a/cppe/src/IceE/Transceiver.h
+++ b/cppe/src/IceE/Transceiver.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_TRANSCEIVER_H
-#define ICE_TRANSCEIVER_H
+#ifndef ICEE_TRANSCEIVER_H
+#define ICEE_TRANSCEIVER_H
 
 #include <IceE/TransceiverF.h>
 #include <IceE/InstanceF.h>
diff --git a/cppe/src/IceE/UnknownEndpoint.cpp b/cppe/src/IceE/UnknownEndpoint.cpp
index aaec152b89c..3c259628faa 100644
--- a/cppe/src/IceE/UnknownEndpoint.cpp
+++ b/cppe/src/IceE/UnknownEndpoint.cpp
@@ -71,7 +71,7 @@ IceInternal::UnknownEndpoint::connector() const
     return 0;
 }
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 AcceptorPtr
 IceInternal::UnknownEndpoint::acceptor(EndpointPtr& endp) const
 {
@@ -86,7 +86,7 @@ IceInternal::UnknownEndpoint::equivalent(const TransceiverPtr&) const
     return false;
 }
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 bool
 IceInternal::UnknownEndpoint::equivalent(const AcceptorPtr&) const
 {
diff --git a/cppe/src/IceE/UnknownEndpoint.h b/cppe/src/IceE/UnknownEndpoint.h
index 4a3a32c3a43..16e5fbf33c6 100644
--- a/cppe/src/IceE/UnknownEndpoint.h
+++ b/cppe/src/IceE/UnknownEndpoint.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_UNKNOWN_ENDPOINT_H
-#define ICE_UNKNOWN_ENDPOINT_H
+#ifndef ICEE_UNKNOWN_ENDPOINT_H
+#define ICEE_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 ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
     virtual AcceptorPtr acceptor(EndpointPtr&) const;
 #endif
     virtual bool equivalent(const TransceiverPtr&) const;
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
     virtual bool equivalent(const AcceptorPtr&) const;
 #endif
 
diff --git a/cppe/src/IceEC/Makefile b/cppe/src/IceEC/Makefile
index 3e9fef834d2..91f39ed7778 100644
--- a/cppe/src/IceEC/Makefile
+++ b/cppe/src/IceEC/Makefile
@@ -114,7 +114,7 @@ endif
 %.o: $(ICE_DIR)/%.cpp
 	$(CXX) -c $(CPPFLAGS) $(CXXFLAGS) $<
 
-CPPFLAGS	:= -I.. $(CPPFLAGS) -DICE_API_EXPORTS -DICE_PURE_CLIENT
+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 decd927947f..7afc43715df 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 "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

+# 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 "ICEE_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 "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

+# 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 "ICEE_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 "ICE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICE_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 "ICEE_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 "ICE_STATIC_LIBS" /D "_LIB" /D "WIN32_LEAN_AND_MEAN" /D FD_SETSIZE=1024 /D "_CONSOLE" /D "ICE_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 "ICEE_PURE_CLIENT" /FD /GZ /c

 # SUBTRACT CPP /Fr /YX

 RSC=rc.exe

 # ADD BASE RSC /l 0x409 /d "_DEBUG"

diff --git a/cppe/src/IceEC/icec.vcp b/cppe/src/IceEC/icec.vcp
index 429e4fde9a4..08860d5d943 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 "ICE_API_EXPORTS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICE_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 "ICEE_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 "ICE_API_EXPORTS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICE_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 "ICEE_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 "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

+# 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 "ICEE_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 "ICE_API_EXPORTS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICE_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 "ICEE_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 "ICE_STATIC_LIBS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICE_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 "ICEE_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 "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

+# 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 "ICEE_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 "ICE_STATIC_LIBS" /D _WIN32_WCE=$(CEVersion) /D "$(CePlatform)" /D UNDER_CE=$(CEVersion) /D "UNICODE" /D "_UNICODE" /D "ICE_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 "ICEE_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 "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

+# 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 "ICEE_PURE_CLIENT" /Gs8192 /GF /O2 /c

 # SUBTRACT CPP /YX

 LIB32=link.exe -lib

 # ADD BASE LIB32 /nologo

diff --git a/cppe/src/TcpTransport/TcpEndpoint.cpp b/cppe/src/TcpTransport/TcpEndpoint.cpp
index a0cb56e8f25..22461413606 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 ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 #   include <IceE/Acceptor.h>
 #endif
 
@@ -337,7 +337,7 @@ IceInternal::TcpEndpoint::operator<(const Endpoint& r) const
     return false;
 }
 
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
 
 AcceptorPtr
 IceInternal::TcpEndpoint::acceptor(EndpointPtr& endp) const
diff --git a/cppe/src/TcpTransport/TcpEndpoint.h b/cppe/src/TcpTransport/TcpEndpoint.h
index fec9948e6fb..0880ca794a0 100644
--- a/cppe/src/TcpTransport/TcpEndpoint.h
+++ b/cppe/src/TcpTransport/TcpEndpoint.h
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#ifndef ICE_TRANSPORT_TCP_ENDPOINT_H
-#define ICE_TRANSPORT_TCP_ENDPOINT_H
+#ifndef ICEE_TRANSPORT_TCP_ENDPOINT_H
+#define ICEE_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 ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
     virtual AcceptorPtr acceptor(EndpointPtr&) const;
 #endif
     virtual bool equivalent(const TransceiverPtr&) const;
-#ifndef ICE_PURE_CLIENT
+#ifndef ICEE_PURE_CLIENT
     virtual bool equivalent(const AcceptorPtr&) const;
 #endif