cleaned up includes.

30 files changed, 98 insertions, 124 deletions

diff --git a/cppe/src/IceE/BasicStream.cpp b/cppe/src/IceE/BasicStream.cpp
index 1633774379b..5925baae4e0 100644
--- a/cppe/src/IceE/BasicStream.cpp
+++ b/cppe/src/IceE/BasicStream.cpp
@@ -9,7 +9,6 @@
 
 #include <IceE/BasicStream.h>
 #include <IceE/Instance.h>
-#include <IceE/Proxy.h>
 #include <IceE/ProxyFactory.h>
 #include <IceE/UserExceptionFactory.h>
 #include <IceE/LocalException.h>
diff --git a/cppe/src/IceE/Current.cpp b/cppe/src/IceE/Current.cpp
index c0c5b957e22..0c0ab145e3b 100755
--- a/cppe/src/IceE/Current.cpp
+++ b/cppe/src/IceE/Current.cpp
@@ -8,8 +8,6 @@
 // **********************************************************************

 

 #include <IceE/Current.h>

-#include <IceE/BasicStream.h>

-#include <IceE/Object.h>

 

 bool

 IceE::Current::operator==(const Current& __rhs) const

diff --git a/cppe/src/IceE/DefaultsAndOverrides.h b/cppe/src/IceE/DefaultsAndOverrides.h
index 9b34e56faa4..5d6aa8ed173 100644
--- a/cppe/src/IceE/DefaultsAndOverrides.h
+++ b/cppe/src/IceE/DefaultsAndOverrides.h
@@ -10,9 +10,9 @@
 #ifndef ICEE_DEFAULTS_AND_OVERRIDES_H
 #define ICEE_DEFAULTS_AND_OVERRIDES_H
 
-#include <IceE/Shared.h>
 #include <IceE/DefaultsAndOverridesF.h>
 #include <IceE/PropertiesF.h>
+#include <IceE/Shared.h>
 
 namespace IceEInternal
 {
diff --git a/cppe/src/IceE/Incoming.cpp b/cppe/src/IceE/Incoming.cpp
index de8a39b47d0..3c0ad8b85a9 100644
--- a/cppe/src/IceE/Incoming.cpp
+++ b/cppe/src/IceE/Incoming.cpp
@@ -8,7 +8,6 @@
 // **********************************************************************
 
 #include <IceE/Incoming.h>
-#include <IceE/ObjectAdapter.h>
 #include <IceE/ServantManager.h>
 #include <IceE/Object.h>
 #include <IceE/Connection.h>
diff --git a/cppe/src/IceE/IncomingConnectionFactory.h b/cppe/src/IceE/IncomingConnectionFactory.h
index fa919f37696..e14dee9e08f 100755
--- a/cppe/src/IceE/IncomingConnectionFactory.h
+++ b/cppe/src/IceE/IncomingConnectionFactory.h
@@ -11,17 +11,18 @@
 #ifndef ICEE_INCOMING_CONNECTION_FACTORY_H
 #define ICEE_INCOMING_CONNECTION_FACTORY_H
 
-#include <IceE/Mutex.h>
-#include <IceE/Monitor.h>
-#include <IceE/Shared.h>
-#include <IceE/Thread.h>
+#include <IceE/IncomingConnectionFactoryF.h>
 #include <IceE/EndpointF.h>
 #include <IceE/ConnectionF.h>
 #include <IceE/ObjectAdapterF.h>
-#include <IceE/IncomingConnectionFactoryF.h>
 #include <IceE/InstanceF.h>
 #include <IceE/AcceptorF.h>
 #include <IceE/TransceiverF.h>
+
+#include <IceE/Mutex.h>
+#include <IceE/Monitor.h>
+#include <IceE/Shared.h>
+#include <IceE/Thread.h>
 #include <list>
 
 namespace IceEInternal
diff --git a/cppe/src/IceE/Initialize.cpp b/cppe/src/IceE/Initialize.cpp
index a85523b70f3..084a4c22a28 100644
--- a/cppe/src/IceE/Initialize.cpp
+++ b/cppe/src/IceE/Initialize.cpp
@@ -7,9 +7,9 @@
 //
 // **********************************************************************
 
+#include <IceE/Initialize.h>
 #include <IceE/Communicator.h>
 #include <IceE/Properties.h>
-#include <IceE/Initialize.h>
 #include <IceE/LocalException.h>
 
 using namespace std;
diff --git a/cppe/src/IceE/Instance.cpp b/cppe/src/IceE/Instance.cpp
index f26f8440b72..88827671b82 100644
--- a/cppe/src/IceE/Instance.cpp
+++ b/cppe/src/IceE/Instance.cpp
@@ -22,13 +22,9 @@
 #include <IceE/ProxyFactory.h>
 #include <IceE/OutgoingConnectionFactory.h>
 #include <IceE/LocalException.h>
-#include <IceE/Exception.h>
 #include <IceE/Properties.h>
 #include <IceE/LoggerI.h>
-#include <IceE/Network.h>
 #include <IceE/EndpointFactory.h>
-#include <IceE/Endpoint.h>
-#include <IceE/Initialize.h>
 #ifndef ICEE_PURE_CLIENT
 #    include <IceE/ObjectAdapterFactory.h>
 #endif
diff --git a/cppe/src/IceE/Instance.h b/cppe/src/IceE/Instance.h
index abd9e85deda..e3b8c8d3e35 100644
--- a/cppe/src/IceE/Instance.h
+++ b/cppe/src/IceE/Instance.h
@@ -10,9 +10,6 @@
 #ifndef ICEE_INSTANCE_H
 #define ICEE_INSTANCE_H
 
-#include <IceE/Shared.h>
-#include <IceE/Mutex.h>
-#include <IceE/RecMutex.h>
 #include <IceE/InstanceF.h>
 #include <IceE/CommunicatorF.h>
 #include <IceE/PropertiesF.h>
@@ -28,6 +25,8 @@
 #ifndef ICEE_PURE_CLIENT
 #    include <IceE/ObjectAdapterFactoryF.h>
 #endif
+#include <IceE/Shared.h>
+#include <IceE/RecMutex.h>
 
 namespace IceE
 {
diff --git a/cppe/src/IceE/LocatorInfo.h b/cppe/src/IceE/LocatorInfo.h
index bd8337df6e8..6834577c002 100644
--- a/cppe/src/IceE/LocatorInfo.h
+++ b/cppe/src/IceE/LocatorInfo.h
@@ -14,12 +14,12 @@
 
 #ifndef ICEE_NO_LOCATOR
 
-#include <IceE/Shared.h>
-#include <IceE/Mutex.h>
 #include <IceE/LocatorInfoF.h>
 #include <IceE/LocatorF.h>
 #include <IceE/ProxyF.h>
 #include <IceE/EndpointF.h>
+#include <IceE/Shared.h>
+#include <IceE/Mutex.h>
 
 namespace IceEInternal
 {
diff --git a/cppe/src/IceE/LoggerI.cpp b/cppe/src/IceE/LoggerI.cpp
index 4099dcb89de..e8de96d0ce8 100644
--- a/cppe/src/IceE/LoggerI.cpp
+++ b/cppe/src/IceE/LoggerI.cpp
@@ -7,8 +7,8 @@
 //
 // **********************************************************************
 
-#include <IceE/Time.h>
 #include <IceE/LoggerI.h>
+#include <IceE/Time.h>
 
 using namespace std;
 using namespace IceE;
diff --git a/cppe/src/IceE/LoggerI.h b/cppe/src/IceE/LoggerI.h
index ef34e9d6579..fe354cb53c2 100644
--- a/cppe/src/IceE/LoggerI.h
+++ b/cppe/src/IceE/LoggerI.h
@@ -10,8 +10,8 @@
 #ifndef ICEE_LOGGER_I_H
 #define ICEE_LOGGER_I_H
 
-#include <IceE/Mutex.h>
 #include <IceE/Logger.h>
+#include <IceE/Mutex.h>
 
 namespace IceE
 {
diff --git a/cppe/src/IceE/Network.h b/cppe/src/IceE/Network.h
index 6bcf1918bbd..9f534c7e224 100644
--- a/cppe/src/IceE/Network.h
+++ b/cppe/src/IceE/Network.h
@@ -69,41 +69,41 @@ typedef int socklen_t;
 namespace IceEInternal
 {
 
-ICEE_PROTOCOL_API bool interrupted();
-ICEE_PROTOCOL_API bool acceptInterrupted();
-ICEE_PROTOCOL_API bool noBuffers();
-ICEE_PROTOCOL_API bool wouldBlock();
-ICEE_PROTOCOL_API bool connectFailed();
-ICEE_PROTOCOL_API bool connectionRefused();
-ICEE_PROTOCOL_API bool connectInProgress();
-ICEE_PROTOCOL_API bool connectionLost();
-ICEE_PROTOCOL_API bool notConnected();
-
-ICEE_PROTOCOL_API SOCKET createSocket();
-ICEE_PROTOCOL_API void closeSocket(SOCKET);
-ICEE_PROTOCOL_API void shutdownSocketWrite(SOCKET);
-ICEE_PROTOCOL_API void shutdownSocketReadWrite(SOCKET);
-
-ICEE_PROTOCOL_API void setBlock(SOCKET, bool);
-ICEE_PROTOCOL_API void setTcpNoDelay(SOCKET);
-ICEE_PROTOCOL_API void setKeepAlive(SOCKET);
-ICEE_PROTOCOL_API void setSendBufferSize(SOCKET, int);
-
-ICEE_PROTOCOL_API void doBind(SOCKET, struct sockaddr_in&);
-ICEE_PROTOCOL_API void doListen(SOCKET, int);
-ICEE_PROTOCOL_API void doConnect(SOCKET, struct sockaddr_in&, int);
-ICEE_PROTOCOL_API SOCKET doAccept(SOCKET, int);
-
-ICEE_PROTOCOL_API void getAddress(const std::string&, int, struct sockaddr_in&);
-ICEE_PROTOCOL_API std::string getLocalHost(bool);
-ICEE_PROTOCOL_API bool compareAddress(const struct sockaddr_in&, const struct sockaddr_in&);
-
-ICEE_PROTOCOL_API std::string errorToString(int);
-ICEE_PROTOCOL_API std::string errorToStringDNS(int);
-ICEE_PROTOCOL_API std::string lastErrorToString();
-
-ICEE_PROTOCOL_API std::string fdToString(SOCKET);
-ICEE_PROTOCOL_API std::string addrToString(const struct sockaddr_in&);
+ICEE_API bool interrupted();
+ICEE_API bool acceptInterrupted();
+ICEE_API bool noBuffers();
+ICEE_API bool wouldBlock();
+ICEE_API bool connectFailed();
+ICEE_API bool connectionRefused();
+ICEE_API bool connectInProgress();
+ICEE_API bool connectionLost();
+ICEE_API bool notConnected();
+
+ICEE_API SOCKET createSocket();
+ICEE_API void closeSocket(SOCKET);
+ICEE_API void shutdownSocketWrite(SOCKET);
+ICEE_API void shutdownSocketReadWrite(SOCKET);
+
+ICEE_API void setBlock(SOCKET, bool);
+ICEE_API void setTcpNoDelay(SOCKET);
+ICEE_API void setKeepAlive(SOCKET);
+ICEE_API void setSendBufferSize(SOCKET, int);
+
+ICEE_API void doBind(SOCKET, struct sockaddr_in&);
+ICEE_API void doListen(SOCKET, int);
+ICEE_API void doConnect(SOCKET, struct sockaddr_in&, int);
+ICEE_API SOCKET doAccept(SOCKET, int);
+
+ICEE_API void getAddress(const std::string&, int, struct sockaddr_in&);
+ICEE_API std::string getLocalHost(bool);
+ICEE_API bool compareAddress(const struct sockaddr_in&, const struct sockaddr_in&);
+
+ICEE_API std::string errorToString(int);
+ICEE_API std::string errorToStringDNS(int);
+ICEE_API std::string lastErrorToString();
+
+ICEE_API std::string fdToString(SOCKET);
+ICEE_API std::string addrToString(const struct sockaddr_in&);
 
 }
 
diff --git a/cppe/src/IceE/ObjectAdapter.cpp b/cppe/src/IceE/ObjectAdapter.cpp
index 3764093e2c0..ac31c07bf22 100644
--- a/cppe/src/IceE/ObjectAdapter.cpp
+++ b/cppe/src/IceE/ObjectAdapter.cpp
@@ -7,13 +7,11 @@
 //
 // **********************************************************************
 
-#include <IceE/UUID.h>
 #include <IceE/ObjectAdapter.h>
+#include <IceE/UUID.h>
 #include <IceE/Instance.h>
-#include <IceE/Proxy.h>
 #include <IceE/ProxyFactory.h>
 #include <IceE/ReferenceFactory.h>
-#include <IceE/Endpoint.h>
 #include <IceE/EndpointFactory.h>
 #include <IceE/IncomingConnectionFactory.h>
 #include <IceE/OutgoingConnectionFactory.h>
@@ -28,9 +26,10 @@
 #ifndef ICEE_NO_ROUTER
 #    include <IceE/RouterInfo.h>
 #    include <IceE/Router.h>
+#    include <IceE/Endpoint.h>
 #endif
 #include <IceE/LoggerUtil.h>
-#include <IceE/Communicator.h>
+
 #include <ctype.h>
 
 using namespace std;
diff --git a/cppe/src/IceE/ObjectAdapterFactory.h b/cppe/src/IceE/ObjectAdapterFactory.h
index 3dd8c5c7d3c..887ad9e626e 100644
--- a/cppe/src/IceE/ObjectAdapterFactory.h
+++ b/cppe/src/IceE/ObjectAdapterFactory.h
@@ -10,14 +10,14 @@
 #ifndef ICEE_OBJECT_ADAPTER_FACTORY_H
 #define ICEE_OBJECT_ADAPTER_FACTORY_H
 
-#include <IceE/Shared.h>

-#include <IceE/Mutex.h>

-#include <IceE/Monitor.h>

-

-#include <IceE/ObjectAdapterF.h>

-#include <IceE/ProxyF.h>

-#include <IceE/CommunicatorF.h>

-#include <IceE/InstanceF.h>

+#include <IceE/ObjectAdapterF.h>
+#include <IceE/ProxyF.h>
+#include <IceE/CommunicatorF.h>
+#include <IceE/InstanceF.h>
+
+#include <IceE/Shared.h>
+#include <IceE/Mutex.h>
+#include <IceE/Monitor.h>
 
 namespace IceEInternal
 {
diff --git a/cppe/src/IceE/Outgoing.cpp b/cppe/src/IceE/Outgoing.cpp
index 0acbbf817fb..4ef9514d867 100644
--- a/cppe/src/IceE/Outgoing.cpp
+++ b/cppe/src/IceE/Outgoing.cpp
@@ -11,7 +11,6 @@
 #include <IceE/DispatchStatus.h>
 #include <IceE/Connection.h>
 #include <IceE/Reference.h>
-#include <IceE/Endpoint.h>
 #include <IceE/LocalException.h>
 
 using namespace std;
diff --git a/cppe/src/IceE/OutgoingConnectionFactory.cpp b/cppe/src/IceE/OutgoingConnectionFactory.cpp
index 2057c42e6a4..c6d25ec7eb4 100755
--- a/cppe/src/IceE/OutgoingConnectionFactory.cpp
+++ b/cppe/src/IceE/OutgoingConnectionFactory.cpp
@@ -13,17 +13,14 @@
 #include <IceE/LoggerUtil.h>
 #include <IceE/TraceLevels.h>
 #include <IceE/DefaultsAndOverrides.h>
-#include <IceE/Properties.h>
-#include <IceE/Transceiver.h>
 #include <IceE/Connector.h>
 #include <IceE/Endpoint.h>
 #include <IceE/RouterInfo.h>
 #include <IceE/LocalException.h>
 #include <IceE/Functional.h>
-#ifndef ICEE_NO_ROUTER
-#   include <IceE/Reference.h>
+#ifndef ICEE_NO_ROUTER

+#  include <IceE/Reference.h>

 #endif
-
 #include <list>
 
 using namespace std;
diff --git a/cppe/src/IceE/OutgoingConnectionFactory.h b/cppe/src/IceE/OutgoingConnectionFactory.h
index fa2de2eae0d..7f0d96e5cb1 100755
--- a/cppe/src/IceE/OutgoingConnectionFactory.h
+++ b/cppe/src/IceE/OutgoingConnectionFactory.h
@@ -10,15 +10,14 @@
 #ifndef ICEE_OUTGOING_CONNECTION_FACTORY_H
 #define ICEE_OUTGOING_CONNECTION_FACTORY_H
 
-#include <IceE/Mutex.h>
-#include <IceE/Monitor.h>
 #include <IceE/OutgoingConnectionFactoryF.h>
 #include <IceE/ConnectionF.h>
 #include <IceE/InstanceF.h>
 #include <IceE/ObjectAdapterF.h>
 #include <IceE/EndpointF.h>
-#include <IceE/TransceiverF.h>
 #include <IceE/RouterF.h>
+#include <IceE/Mutex.h>
+#include <IceE/Monitor.h>
 #include <set>
 
 namespace IceEInternal
diff --git a/cppe/src/IceE/Proxy.cpp b/cppe/src/IceE/Proxy.cpp
index 0f0c50412be..93081127db0 100644
--- a/cppe/src/IceE/Proxy.cpp
+++ b/cppe/src/IceE/Proxy.cpp
@@ -11,12 +11,12 @@
 #include <IceE/ProxyFactory.h>
 #include <IceE/Outgoing.h>
 #include <IceE/Reference.h>
-#include <IceE/Endpoint.h>
 #include <IceE/Instance.h>
-#include <IceE/RouterInfo.h>
-#include <IceE/LocatorInfo.h>
 #include <IceE/BasicStream.h>
 #include <IceE/LocalException.h>
+#ifndef ICEE_NO_ROUTER

+#  include <IceE/RouterInfo.h>

+#endif

 
 using namespace std;
 using namespace IceE;
diff --git a/cppe/src/IceE/ProxyFactory.cpp b/cppe/src/IceE/ProxyFactory.cpp
index 4031a0ce342..52474583603 100644
--- a/cppe/src/IceE/ProxyFactory.cpp
+++ b/cppe/src/IceE/ProxyFactory.cpp
@@ -7,14 +7,14 @@
 //
 // **********************************************************************
 
+#include <IceE/ProxyFactory.h>
 #include <IceE/Thread.h>
 #include <IceE/Time.h>
-#include <IceE/ProxyFactory.h>
 #include <IceE/Instance.h>
 #include <IceE/Proxy.h>
+#include <IceE/Reference.h>

 #include <IceE/ReferenceFactory.h>
 #include <IceE/LocatorInfo.h>
-#include <IceE/BasicStream.h>
 #include <IceE/Properties.h>
 #include <IceE/LoggerUtil.h>
 #include <IceE/TraceLevels.h>
diff --git a/cppe/src/IceE/ProxyFactory.h b/cppe/src/IceE/ProxyFactory.h
index 99e417a9cc5..c0c2278a4ac 100644
--- a/cppe/src/IceE/ProxyFactory.h
+++ b/cppe/src/IceE/ProxyFactory.h
@@ -10,12 +10,11 @@
 #ifndef ICEE_PROXY_FACTORY_H
 #define ICEE_PROXY_FACTORY_H
 
-#include <IceE/Shared.h>
-#include <IceE/Mutex.h>
 #include <IceE/ProxyFactoryF.h>
 #include <IceE/InstanceF.h>
 #include <IceE/ReferenceF.h>
 #include <IceE/ProxyF.h>
+#include <IceE/Shared.h>
 #include <IceE/Exception.h>
 
 namespace IceEInternal
diff --git a/cppe/src/IceE/Reference.cpp b/cppe/src/IceE/Reference.cpp
index 39a77a59977..0a9a810338f 100644
--- a/cppe/src/IceE/Reference.cpp
+++ b/cppe/src/IceE/Reference.cpp
@@ -17,13 +17,13 @@
 #ifndef ICEE_NO_ROUTER
 #    include <IceE/RouterInfo.h>
 #    include <IceE/Router.h>
+#    include <IceE/Connection.h>

 #endif
 #ifndef ICEE_NO_LOCATOR
 #    include <IceE/LocatorInfo.h>
 #    include <IceE/Locator.h>
 #endif
 #include <IceE/Functional.h>
-#include <IceE/Connection.h>
 #include <IceE/OutgoingConnectionFactory.h>
 #include <IceE/LoggerUtil.h>
 #include <IceE/TraceLevels.h>
diff --git a/cppe/src/IceE/Reference.h b/cppe/src/IceE/Reference.h
index 61af67d50b7..ed7931d1fca 100644
--- a/cppe/src/IceE/Reference.h
+++ b/cppe/src/IceE/Reference.h
@@ -10,17 +10,20 @@
 #ifndef ICEE_REFERENCE_H
 #define ICEE_REFERENCE_H
 
-#include <IceE/Shared.h>
-#include <IceE/Mutex.h>
 #include <IceE/ReferenceF.h>
-#include <IceE/ReferenceFactoryF.h>
 #include <IceE/EndpointF.h>
 #include <IceE/InstanceF.h>
-#include <IceE/RouterF.h>
-#include <IceE/LocatorF.h>
-#include <IceE/RouterInfoF.h>
-#include <IceE/LocatorInfoF.h>
+#ifndef ICEE_NO_ROUTER
+#  include <IceE/RouterInfoF.h>
+#  include <IceE/RouterF.h>
+#endif
+#ifndef ICEE_NO_LOCATOR
+#  include <IceE/LocatorInfoF.h>
+#  include <IceE/LocatorF.h>
+#endif
 #include <IceE/ConnectionF.h>
+#include <IceE/Shared.h>
+#include <IceE/Mutex.h>
 #include <IceE/Identity.h>
 
 namespace IceEInternal
diff --git a/cppe/src/IceE/ReferenceFactory.cpp b/cppe/src/IceE/ReferenceFactory.cpp
index ef14ad36dc9..10e8531ba0b 100644
--- a/cppe/src/IceE/ReferenceFactory.cpp
+++ b/cppe/src/IceE/ReferenceFactory.cpp
@@ -8,14 +8,16 @@
 // **********************************************************************
 
 #include <IceE/ReferenceFactory.h>
-#include <IceE/ProxyFactory.h>
 #include <IceE/LocalException.h>
 #include <IceE/Instance.h>
 #include <IceE/IdentityUtil.h>
-#include <IceE/Endpoint.h>
 #include <IceE/EndpointFactory.h>
-#include <IceE/RouterInfo.h>
-#include <IceE/LocatorInfo.h>
+#ifndef ICEE_NO_ROUTER
+#  include <IceE/RouterInfo.h>
+#endif
+#ifndef ICEE_NO_LOCATOR
+#  include <IceE/LocatorInfo.h>
+#endif
 #include <IceE/BasicStream.h>
 #include <IceE/StringUtil.h>
 
diff --git a/cppe/src/IceE/ReferenceFactory.h b/cppe/src/IceE/ReferenceFactory.h
index bf540e42aa1..cf56bda9e3e 100644
--- a/cppe/src/IceE/ReferenceFactory.h
+++ b/cppe/src/IceE/ReferenceFactory.h
@@ -10,11 +10,11 @@
 #ifndef ICEE_REFERENCE_FACTORY_H
 #define ICEE_REFERENCE_FACTORY_H
 
+#include <IceE/ReferenceFactoryF.h>
+#include <IceE/ConnectionF.h>
 #include <IceE/Shared.h>
 #include <IceE/Mutex.h>
-#include <IceE/ReferenceFactoryF.h>
 #include <IceE/Reference.h> // For Reference::Mode
-#include <IceE/ConnectionF.h>
 
 namespace IceEInternal
 {
diff --git a/cppe/src/IceE/RouterInfo.h b/cppe/src/IceE/RouterInfo.h
index 6ff086ad717..af222755f94 100644
--- a/cppe/src/IceE/RouterInfo.h
+++ b/cppe/src/IceE/RouterInfo.h
@@ -14,12 +14,11 @@
 
 #ifndef ICEE_NO_ROUTER
 
-#include <IceE/Shared.h>
-#include <IceE/Mutex.h>
 #include <IceE/RouterInfoF.h>
 #include <IceE/RouterF.h>
-#include <IceE/ProxyF.h>
 #include <IceE/RoutingTableF.h>
+#include <IceE/Shared.h>
+#include <IceE/Mutex.h>
 
 namespace IceEInternal
 {
diff --git a/cppe/src/IceE/RoutingTable.cpp b/cppe/src/IceE/RoutingTable.cpp
index f75e8d9b922..dd4b24ed322 100644
--- a/cppe/src/IceE/RoutingTable.cpp
+++ b/cppe/src/IceE/RoutingTable.cpp
@@ -7,6 +7,8 @@
 //
 // **********************************************************************
 
+#include <IceE/Config.h>
+
 #ifndef ICEE_NO_ROUTER
 
 #include <IceE/RoutingTable.h>
diff --git a/cppe/src/IceE/SafeStdio.cpp b/cppe/src/IceE/SafeStdio.cpp
index 1b1d1b4fb6e..ba18222cc6a 100755
--- a/cppe/src/IceE/SafeStdio.cpp
+++ b/cppe/src/IceE/SafeStdio.cpp
@@ -10,22 +10,8 @@
 #include <IceE/SafeStdio.h>
 #include <stdarg.h>
 #include <stdio.h>
-

-using namespace std;

 
-void
-IceE::safesnprintf(char* buf, size_t size, const char* fmt, ...)
-{
-    va_list ap;
-    va_start(ap, fmt);
-#if defined(_WIN32) || defined(_WIN32_WCE)
-    _vsnprintf(buf, size-1, fmt, ap);
-#else
-    vsnprintf(buf, size-1, fmt, ap);
-#endif
-    buf[size-1] = '\0';
-    va_end(ap);
-}
+using namespace std;
 
 string
 IceE::printfToString(const char* fmt, ...)
diff --git a/cppe/src/IceE/ServantManager.cpp b/cppe/src/IceE/ServantManager.cpp
index a8ff07b5fc4..23ca77e2543 100644
--- a/cppe/src/IceE/ServantManager.cpp
+++ b/cppe/src/IceE/ServantManager.cpp
@@ -10,7 +10,6 @@
 #include <IceE/ServantManager.h>
 #include <IceE/LocalException.h>
 #include <IceE/IdentityUtil.h>
-#include <IceE/LoggerUtil.h>
 #include <IceE/Instance.h>
 #include <IceE/StringUtil.h>
 
diff --git a/cppe/src/IceE/ServantManager.h b/cppe/src/IceE/ServantManager.h
index ad27dc113d4..87da4e70402 100644
--- a/cppe/src/IceE/ServantManager.h
+++ b/cppe/src/IceE/ServantManager.h
@@ -10,10 +10,10 @@
 #ifndef ICEE_SERVANT_MANAGER_H
 #define ICEE_SERVANT_MANAGER_H
 
-#include <IceE/Shared.h>
-#include <IceE/Mutex.h>
 #include <IceE/ServantManagerF.h>
 #include <IceE/InstanceF.h>
+#include <IceE/Shared.h>
+#include <IceE/Mutex.h>
 #include <IceE/Identity.h>
 #include <IceE/FacetMap.h>
 
diff --git a/cppe/src/IceE/TraceUtil.cpp b/cppe/src/IceE/TraceUtil.cpp
index 8902dab5668..29cc03493c7 100644
--- a/cppe/src/IceE/TraceUtil.cpp
+++ b/cppe/src/IceE/TraceUtil.cpp
@@ -7,18 +7,16 @@
 //
 // **********************************************************************
 
-#include <IceE/StringUtil.h>
 #include <IceE/TraceUtil.h>
-#include <IceE/Instance.h>
+#include <IceE/StringUtil.h>
 #include <IceE/DispatchStatus.h>
-#include <IceE/Proxy.h>
 #include <IceE/TraceLevels.h>
 #include <IceE/Logger.h>
 #include <IceE/BasicStream.h>
 #include <IceE/Protocol.h>
 #include <IceE/IdentityUtil.h>
 #include <IceE/SafeStdio.h>
-#include <IceE/OperationMode.h>

+#include <IceE/OperationMode.h>
 
 using namespace std;
 using namespace IceE;