diff -urN Ice-3.0.0/src/IceGrid/DescriptorHelper.h Ice-3.0.0.patched.clean/src/IceGrid/DescriptorHelper.h
--- Ice-3.0.0/src/IceGrid/DescriptorHelper.h	2005-11-11 14:56:10 +0100
+++ Ice-3.0.0.patched.clean/src/IceGrid/DescriptorHelper.h	2006-02-06 17:55:04 +0100
@@ -133,35 +133,6 @@
 };
 typedef IceUtil::Handle<ServerHelper> ServerHelperPtr;
 
-class ServiceInstanceHelper;
-
-class IceBoxHelper : public ServerHelper
-{
-public:
-
-    IceBoxHelper(const IceBoxDescriptorPtr&);
-    IceBoxHelper() { }
-
-    bool operator==(const IceBoxHelper&) const;
-    bool operator!=(const IceBoxHelper&) const;    
-
-    virtual ServerDescriptorPtr instantiate(const Resolver&) const;
-
-    virtual void getIds(std::multiset<std::string>&, std::multiset<Ice::Identity>&) const;
-
-    void print(IceUtil::Output&, const std::string& = std::string(), const std::string& = std::string()) const;
-
-protected:
-
-    void instantiateImpl(const IceBoxDescriptorPtr&, const Resolver&) const;
-
-private:
-    
-    IceBoxDescriptorPtr _desc;
-
-    std::vector<ServiceInstanceHelper> _services;
-};
-
 class InstanceHelper
 {
 protected:
@@ -195,6 +166,34 @@
     mutable ServiceHelper _service;
 };
 
+
+class IceBoxHelper : public ServerHelper
+{
+public:
+
+    IceBoxHelper(const IceBoxDescriptorPtr&);
+    IceBoxHelper() { }
+
+    bool operator==(const IceBoxHelper&) const;
+    bool operator!=(const IceBoxHelper&) const;    
+
+    virtual ServerDescriptorPtr instantiate(const Resolver&) const;
+
+    virtual void getIds(std::multiset<std::string>&, std::multiset<Ice::Identity>&) const;
+
+    void print(IceUtil::Output&, const std::string& = std::string(), const std::string& = std::string()) const;
+
+protected:
+
+    void instantiateImpl(const IceBoxDescriptorPtr&, const Resolver&) const;
+
+private:
+    
+    IceBoxDescriptorPtr _desc;
+
+    std::vector<ServiceInstanceHelper> _services;
+};
+
 class ServerInstanceHelper : public InstanceHelper
 {
 public: