diff --git a/ridlbe/c++11/templates/impl/hdr/interface_pre.erb b/ridlbe/c++11/templates/impl/hdr/interface_pre.erb
index 0fe909e2..c9d75207 100644
--- a/ridlbe/c++11/templates/impl/hdr/interface_pre.erb
+++ b/ridlbe/c++11/templates/impl/hdr/interface_pre.erb
@@ -6,19 +6,12 @@ namespace _impl
     : public CORBA::servant_traits<<%= scoped_cxxtype %>>::base_type
 % nest { write_regen_section("#{scoped_cxxname}"+'[Base List]', default_content: '// your base classes') }
   {
-  protected:
+  public:
 % nest(2) { write_regen_section("#{scoped_cxxname}"+'[Constructors]', default_content: ['/// Constructor(s)', "#{skel_cxxname} ();"]) }
 
     /// Destructor
     ~<%= skel_cxxname %> () override;
 
-    template <typename T> friend class CORBA::servant_reference;
-
-    template <typename _Tp1, typename, typename ...Args>
-    friend constexpr CORBA::servant_reference<_Tp1> CORBA::make_reference(Args&& ...args);
-
-% nest(2) { write_regen_section("#{scoped_cxxname}"+'[User Protected]', default_content: '// your protected definitions') }
-  public:
 %   if has_abstract_base?
 %     unless abstractbase_operations.empty?
 
@@ -39,4 +32,6 @@ namespace _impl
     //@}
 %     end
 %   end
+% nest(2) { write_regen_section("#{scoped_cxxname}"+'[User Protected]', default_content: '// your protected definitions') }
+
 % inc_nest
diff --git a/tests/custom_format/custom_format_impl.h b/tests/custom_format/custom_format_impl.h
index 96cd20ef..840f0ce1 100644
--- a/tests/custom_format/custom_format_impl.h
+++ b/tests/custom_format/custom_format_impl.h
@@ -32,7 +32,7 @@ namespace Test
   // your base classes
   //@@{__RIDL_REGEN_MARKER__} - END : Test::Foo_impl[Base List]
   {
-  protected:
+  public:
     //@@{__RIDL_REGEN_MARKER__} - BEGIN : Test::Foo_impl[Constructors]
     /// Constructor(s)'
     Foo_impl (IDL::traits<CORBA::ORB>::ref_type orb);
@@ -41,15 +41,9 @@ namespace Test
     /// Destructor
     ~Foo_impl () override;
 
-    template <typename T> friend class CORBA::servant_reference;
-
-    template <typename _Tp1, typename, typename ...Args>
-    friend constexpr CORBA::servant_reference<_Tp1> CORBA::make_reference(Args&& ...args);
-
     //@@{__RIDL_REGEN_MARKER__} - BEGIN : Test::Foo_impl[User Protected]
     // your protected definitions
     //@@{__RIDL_REGEN_MARKER__} - END : Test::Foo_impl[User Protected]
-  public:
 
     // generated from c++11/templates/impl/hdr/operation.erb
     /// @copydoc Test::Foo::write_on_servant
diff --git a/tests/hello_regen/test_impl.h b/tests/hello_regen/test_impl.h
index dfbbe87f..a31404be 100644
--- a/tests/hello_regen/test_impl.h
+++ b/tests/hello_regen/test_impl.h
@@ -31,7 +31,7 @@ namespace Test
     // your base classes
     //@@{__RIDL_REGEN_MARKER__} - END : Test::Foo[Base List]
     {
-    protected:
+    public:
       //@@{__RIDL_REGEN_MARKER__} - BEGIN : Test::Foo[Constructors]
       /// Constructor(s)
       Foo ();
@@ -40,15 +40,10 @@ namespace Test
       /// Destructor
       ~Foo () override;
 
-      template <typename T> friend class CORBA::servant_reference;
-
-      template <typename _Tp1, typename, typename ...Args>
-      friend constexpr CORBA::servant_reference<_Tp1> CORBA::make_reference(Args&& ...args);
-
       //@@{__RIDL_REGEN_MARKER__} - BEGIN : Test::Foo[User Protected]
       // your protected definitions
       //@@{__RIDL_REGEN_MARKER__} - END : Test::Foo[User Protected]
-    public:
+
 
       // generated from c++11/templates/impl/hdr/interface_post
       //@@{__RIDL_REGEN_MARKER__} - BEGIN : Test::Foo[User Public]
@@ -77,7 +72,7 @@ namespace Test
     // your base classes
     //@@{__RIDL_REGEN_MARKER__} - END : Test::Hello[Base List]
     {
-    protected:
+    public:
       //@@{__RIDL_REGEN_MARKER__} - BEGIN : Test::Hello[Constructors]
       /// Constructor(s)
       Hello (IDL::traits<CORBA::ORB>::ref_type orb);
@@ -86,15 +81,10 @@ namespace Test
       /// Destructor
       ~Hello () override;
 
-      template <typename T> friend class CORBA::servant_reference;
-
-      template <typename _Tp1, typename, typename ...Args>
-      friend constexpr CORBA::servant_reference<_Tp1> CORBA::make_reference(Args&& ...args);
-
       //@@{__RIDL_REGEN_MARKER__} - BEGIN : Test::Hello[User Protected]
       // your protected definitions
       //@@{__RIDL_REGEN_MARKER__} - END : Test::Hello[User Protected]
-    public:
+
 
       // generated from c++11/templates/impl/hdr/attribute
       int32_t
diff --git a/tests/obv/simple/client_i.h b/tests/obv/simple/client_i.h
index 942bbcc1..c8e04597 100644
--- a/tests/obv/simple/client_i.h
+++ b/tests/obv/simple/client_i.h
@@ -26,10 +26,6 @@ class Client_i final
 
   void shutdown () override;
 
-  template <typename _Tp1, typename, typename ...Args>
-  friend constexpr CORBA::servant_reference<_Tp1> CORBA::make_reference(Args&& ...args);
-
-protected:
   using base_type = CORBA::servant_traits<Test::Client>::base_type;
 
   Client_i (CORBA::ORB::_ref_type orb)
diff --git a/tests/write_traits/write_traits_impl.h b/tests/write_traits/write_traits_impl.h
index e39a8777..cf98e597 100644
--- a/tests/write_traits/write_traits_impl.h
+++ b/tests/write_traits/write_traits_impl.h
@@ -32,7 +32,7 @@ namespace Test
   // your base classes
   //@@{__RIDL_REGEN_MARKER__} - END : Test::Foo_impl[Base List]
   {
-  protected:
+  public:
     //@@{__RIDL_REGEN_MARKER__} - BEGIN : Test::Foo_impl[Constructors]
     /// Constructor(s)'
     Foo_impl (IDL::traits<CORBA::ORB>::ref_type orb);
@@ -41,15 +41,9 @@ namespace Test
     /// Destructor
     ~Foo_impl () override;
 
-    template <typename T> friend class CORBA::servant_reference;
-
-    template <typename _Tp1, typename, typename ...Args>
-    friend constexpr CORBA::servant_reference<_Tp1> CORBA::make_reference(Args&& ...args);
-
     //@@{__RIDL_REGEN_MARKER__} - BEGIN : Test::Foo_impl[User Protected]
     // your protected definitions
     //@@{__RIDL_REGEN_MARKER__} - END : Test::Foo_impl[User Protected]
-  public:
 
     // generated from c++11/templates/impl/hdr/operation.erb
     /// @copydoc Test::Foo::write_on_servant