4 files changed, 49 insertions, 5 deletions
diff --git a/cppe/include/IceE/Acceptor.h b/cppe/include/IceE/Acceptor.h
index 9ec75748fb1..e4831ed3851 100644
--- a/cppe/include/IceE/Acceptor.h
+++ b/cppe/include/IceE/Acceptor.h
@@ -10,13 +10,14 @@
 #ifndef ICEE_TRANSPORT_ACCEPTOR_H
 #define ICEE_TRANSPORT_ACCEPTOR_H
 
-#include <IceE/Shared.h>
 #include <IceE/TransceiverF.h>
 #include <IceE/InstanceF.h>
 #include <IceE/TraceLevelsF.h>
 #include <IceE/LoggerF.h>
 #include <IceE/AcceptorF.h>
 
+#include <IceE/Shared.h>
+
 #ifdef _WIN32
 typedef int ssize_t;
 #else
diff --git a/cppe/include/IceE/IceE.h b/cppe/include/IceE/IceE.h
index 5407a57a21b..5b22b9cb615 100644
--- a/cppe/include/IceE/IceE.h
+++ b/cppe/include/IceE/IceE.h
@@ -16,9 +16,11 @@
 #include <IceE/Logger.h>
 #include <IceE/LoggerUtil.h>
 #include <IceE/Communicator.h>
-#include <IceE/ObjectAdapter.h>
-#include <IceE/Proxy.h>
-#include <IceE/Object.h>
+#ifndef ICEE_PURE_CLIENT
+#  include <IceE/ObjectAdapter.h>
+#  include <IceE/Object.h>
+#endif
+#  include <IceE/Proxy.h>
 #include <IceE/IdentityUtil.h>
 #include <IceE/Connection.h>
 #include <IceE/Functional.h>
diff --git a/cppe/include/IceE/LocatorInfoF.h b/cppe/include/IceE/LocatorInfoF.h
new file mode 100644
index 00000000000..14118fe4804
--- /dev/null
+++ b/cppe/include/IceE/LocatorInfoF.h
@@ -0,0 +1,41 @@
+// **********************************************************************
+//
+// Copyright (c) 2003-2005 ZeroC, Inc. All rights reserved.
+//
+// This copy of Ice is licensed to you under the terms described in the
+// ICEE_LICENSE file included in this distribution.
+//
+// **********************************************************************
+
+#ifndef ICEE_LOCATOR_INFO_F_H
+#define ICEE_LOCATOR_INFO_F_H
+
+#include <IceE/Config.h>
+
+#ifndef ICEE_NO_LOCATOR
+
+#include <IceE/Handle.h>
+
+namespace IceEInternal
+{
+
+class LocatorManager;
+void incRef(LocatorManager*);
+void decRef(LocatorManager*);
+typedef Handle<LocatorManager> LocatorManagerPtr;
+
+class LocatorInfo;
+void incRef(LocatorInfo*);
+void decRef(LocatorInfo*);
+typedef Handle<LocatorInfo> LocatorInfoPtr;
+
+class LocatorTable;
+void incRef(LocatorTable*);
+void decRef(LocatorTable*);
+typedef Handle<LocatorTable> LocatorTablePtr;
+
+}
+
+#endif
+
+#endif
diff --git a/cppe/include/IceE/ObjectAdapter.h b/cppe/include/IceE/ObjectAdapter.h
index f1a6256980d..8371a74d347 100755
--- a/cppe/include/IceE/ObjectAdapter.h
+++ b/cppe/include/IceE/ObjectAdapter.h
@@ -25,7 +25,7 @@
 #include <IceE/EndpointF.h>
 #include <IceE/RouterF.h>
 #include <IceE/LocatorF.h>
-//#include <IceE/LocatorInfoF.h>
+#include <IceE/LocatorInfoF.h>
 #include <IceE/FacetMap.h>
 #include <list>