diff --git a/include/boost/python/suite/indexing/algo_selector.hpp b/include/boost/python/suite/indexing/algo_selector.hpp
index 25c2c563..486539d5 100755
--- a/include/boost/python/suite/indexing/algo_selector.hpp
+++ b/include/boost/python/suite/indexing/algo_selector.hpp
@@ -26,6 +26,7 @@
 // Include this early to ensure the declaration of the get_pointer
 // overload for element_proxy is in-scope for both name-lookup phases
 
+#include <boost/python/suite/indexing/element_proxy_traits.hpp>
 #include <boost/python/suite/indexing/container_traits.hpp>
 #include <boost/python/suite/indexing/algorithms.hpp>
 
@@ -164,10 +165,10 @@ namespace boost { namespace python { namespace indexing {
     };
 
     // Container proxies
-    template <typename RawContainer>
-    class selector_impl<container_proxy<RawContainer> >
+    template <typename RawContainer, typename Holder, typename Generator>
+    class selector_impl<container_proxy<RawContainer, Holder, Generator> >
     {
-      typedef container_proxy<RawContainer> Container;
+      typedef container_proxy<RawContainer, Holder, Generator> Container;
 
       typedef container_proxy_traits<Container>       mutable_traits;
       typedef container_proxy_traits<Container const> const_traits;
diff --git a/include/boost/python/suite/indexing/proxy_iterator.hpp b/include/boost/python/suite/indexing/proxy_iterator.hpp
index 67fa7d8d..16e5c4ab 100755
--- a/include/boost/python/suite/indexing/proxy_iterator.hpp
+++ b/include/boost/python/suite/indexing/proxy_iterator.hpp
@@ -1,5 +1,4 @@
-// -*- mode:c++ -*-
-//
+
 // Header file proxy_iterator.hpp
 //
 // Copyright (c) 2003 Raoul M. Gough
@@ -24,7 +23,7 @@ namespace boost { namespace python { namespace indexing {
   template<class ContainerProxy>
   class proxy_iterator
   {
-    template<class C, class H> friend class container_proxy;
+    template<class C, class H, class G> friend class container_proxy;
 
   public:
     typedef ContainerProxy container_proxy_;
diff --git a/include/boost/python/suite/indexing/shared_proxy_impl.hpp b/include/boost/python/suite/indexing/shared_proxy_impl.hpp
index b14aad91..c57889c7 100755
--- a/include/boost/python/suite/indexing/shared_proxy_impl.hpp
+++ b/include/boost/python/suite/indexing/shared_proxy_impl.hpp
@@ -1,4 +1,3 @@
-// -*- mode:c++; switch-modules-target: "container_proxy.hpp" -*-
 //
 // Header file shared_proxy_impl.hpp
 //
@@ -48,7 +47,7 @@ namespace boost { namespace python { namespace indexing {
     // Creates value-only (detached) proxy
 
   private:
-    template<class C, class A> friend class container_proxy;
+    template<class C, class A, class G> friend class container_proxy;
 
     shared_proxy_impl (ContainerProxy *, size_t);
     void detach ();