diff --git a/include/mrdocs/Corpus.hpp b/include/mrdocs/Corpus.hpp
index d50ee6e35..c74537137 100644
--- a/include/mrdocs/Corpus.hpp
+++ b/include/mrdocs/Corpus.hpp
@@ -221,7 +221,7 @@ class MRDOCS_VISIBLE
             {
                 if (!opts.skipInherited)
                 {
-                    auto MS = allMembers(I);
+                    auto&& MS = allMembers(I);
                     visitIDs(MS,
                         std::forward<F>(f),
                         std::forward<Args>(args)...);
@@ -257,7 +257,7 @@ class MRDOCS_VISIBLE
             }
             else /* ordered */
             {
-                auto members0 = allMembers(I);
+                auto&& members0 = allMembers(I);
                 static_assert(range_of<decltype(members0), SymbolID>);
                 std::vector<SymbolID> members;
                 members.reserve(std::ranges::distance(members0));
diff --git a/include/mrdocs/Metadata/Info/Overloads.hpp b/include/mrdocs/Metadata/Info/Overloads.hpp
index d88e3f79b..172e06972 100644
--- a/include/mrdocs/Metadata/Info/Overloads.hpp
+++ b/include/mrdocs/Metadata/Info/Overloads.hpp
@@ -34,6 +34,8 @@ struct OverloadsInfo final
     /// Info about the return type of this function.
     Polymorphic<TypeInfo> ReturnType = std::nullopt;
 
+    StorageClassKind StorageClass = StorageClassKind::None;
+
     //--------------------------------------------
 
     explicit OverloadsInfo(SymbolID const& ID) noexcept
diff --git a/include/mrdocs/Metadata/Info/Record.hpp b/include/mrdocs/Metadata/Info/Record.hpp
index db83088d9..972e5ab7e 100644
--- a/include/mrdocs/Metadata/Info/Record.hpp
+++ b/include/mrdocs/Metadata/Info/Record.hpp
@@ -200,7 +200,6 @@ tag_invoke(
     v = dom::LazyObject(I, domCorpus);
 }
 
-
 inline
 auto
 allMembers(RecordInterface const& T)
@@ -275,6 +274,13 @@ tag_invoke(
     v = toString(kind);
 }
 
+struct MemberInfo
+{
+    AccessKind EffectiveAccess;
+    InfoKind Kind;
+    SymbolID id;
+};
+
 /** Metadata for struct, class, or union.
 */
 struct RecordInfo final
@@ -301,11 +307,15 @@ struct RecordInfo final
     */
     std::vector<BaseInfo> Bases;
 
-    /** List of derived classes
+    /** List of derived classes.
      */
     std::vector<SymbolID> Derived;
 
-    /** Lists of members.
+    /** List of members.
+     */
+    std::vector<MemberInfo> Members;
+
+    /** Record Interface (NOT part of the Corpus.)
      */
     RecordInterface Interface;
 
@@ -345,6 +355,7 @@ inline
 auto
 allMembers(RecordInfo const& T)
 {
+    //return std::views::transform(T.Members, &MemberInfo::id);
     return allMembers(T.Interface);
 }
 
@@ -374,6 +385,7 @@ tag_invoke(
     io.map("isTypedef", I.IsTypeDef);
     io.map("bases", dom::LazyArray(I.Bases, domCorpus));
     io.map("derived", dom::LazyArray(I.Derived, domCorpus));
+    //io.map("members", dom::LazyArray(I.Members, domCorpus));
     io.map("interface", I.Interface);
     io.map("template", I.Template);
     io.map("friends", dom::LazyArray(I.Friends, domCorpus));
diff --git a/src/lib/AST/ASTVisitor.cpp b/src/lib/AST/ASTVisitor.cpp
index a33826061..d285934fd 100644
--- a/src/lib/AST/ASTVisitor.cpp
+++ b/src/lib/AST/ASTVisitor.cpp
@@ -1770,19 +1770,9 @@ addMember(
     RecordInfo& I,
     Info const& Member)
 {
-    switch (Member.Access)
+    if (!std::ranges::contains(I.Members, Member.id, &MemberInfo::id))
     {
-    case AccessKind::Public:
-        addMember(I.Interface.Public, Member);
-        break;
-    case AccessKind::Private:
-        addMember(I.Interface.Private, Member);
-        break;
-    case AccessKind::Protected:
-        addMember(I.Interface.Protected, Member);
-        break;
-    default:
-        MRDOCS_UNREACHABLE();
+        I.Members.emplace_back(Member.Access, Member.Kind, Member.id);
     }
 }
 
diff --git a/src/lib/CorpusImpl.cpp b/src/lib/CorpusImpl.cpp
index 258c4c8e6..29f68da15 100644
--- a/src/lib/CorpusImpl.cpp
+++ b/src/lib/CorpusImpl.cpp
@@ -20,6 +20,7 @@
 #include "lib/Metadata/Finalizers/JavadocFinalizer.hpp"
 #include "lib/Metadata/Finalizers/NamespacesFinalizer.hpp"
 #include "lib/Metadata/Finalizers/OverloadsFinalizer.hpp"
+#include "lib/Metadata/Finalizers/RecordsFinalizer.hpp"
 #include "lib/Metadata/Finalizers/SortMembersFinalizer.hpp"
 #include "lib/Support/Chrono.hpp"
 #include "lib/Support/Report.hpp"
@@ -1025,6 +1026,13 @@ CorpusImpl::finalize()
         finalizer.build();
     }
 
+    // Finalizing record interfaces
+    {
+        report::debug("  - Finalizing records");
+        RecordsFinalizer finalizer(*this);
+        finalizer.build();
+    }
+
     // Add auto relates for member functions
     {
         report::debug("  - Finalizing auto-relates");
diff --git a/src/lib/Metadata/Finalizers/BaseMembersFinalizer.cpp b/src/lib/Metadata/Finalizers/BaseMembersFinalizer.cpp
index 40b944618..06c70d94a 100644
--- a/src/lib/Metadata/Finalizers/BaseMembersFinalizer.cpp
+++ b/src/lib/Metadata/Finalizers/BaseMembersFinalizer.cpp
@@ -15,20 +15,19 @@
 
 namespace clang::mrdocs {
 
-void
-BaseMembersFinalizer::
-inheritBaseMembers(RecordInfo& I, RecordInfo const& B, AccessKind const A)
+namespace {
+bool
+shouldCopy(Config const& config, Info const& M)
 {
-    inheritBaseMembers(I.id, I.Interface, B.Interface, A);
+    if (config->inheritBaseMembers == PublicSettings::BaseMemberInheritance::CopyDependencies)
+    {
+        return M.Extraction == ExtractionMode::Dependency;
+    }
+    return config->inheritBaseMembers == PublicSettings::BaseMemberInheritance::CopyAll;
 }
 
-void
-BaseMembersFinalizer::
-inheritBaseMembers(
-    SymbolID const& derivedId,
-    RecordInterface& derived,
-    RecordInterface const& base,
-    AccessKind const A)
+AccessKind
+effectiveAccess(AccessKind const declaredAccess, AccessKind const A)
 {
     if (A == AccessKind::Public)
     {
@@ -37,8 +36,7 @@ inheritBaseMembers(
         // members of the derived class and all protected members of the base
         // class are accessible as protected members of the derived class.
         // Private members of the base are never accessible unless friended.
-        inheritBaseMembers(derivedId, derived.Public, base.Public);
-        inheritBaseMembers(derivedId, derived.Protected, base.Protected);
+        return declaredAccess;
     }
     else if (A == AccessKind::Protected)
     {
@@ -46,62 +44,35 @@ inheritBaseMembers(
         // base, all public and protected members of the base class are
         // accessible as protected members of the derived class (private members
         // of the base are never accessible unless friended).
-        inheritBaseMembers(derivedId, derived.Protected, base.Public);
-        inheritBaseMembers(derivedId, derived.Protected, base.Protected);
+        return AccessKind::Protected;
     }
-    else if (A == AccessKind::Private && corpus_.config->extractPrivate)
+    else if (A == AccessKind::Private)
     {
         // When a class uses private member access specifier to derive from a
         // base, all public and protected members of the base class are
         // accessible as private members of the derived class (private members
         // of the base are never accessible unless friended).
-        inheritBaseMembers(derivedId, derived.Private, base.Public);
-        inheritBaseMembers(derivedId, derived.Private, base.Protected);
+        return AccessKind::Private;
     }
-}
 
-void
-BaseMembersFinalizer::
-inheritBaseMembers(
-    SymbolID const& derivedId,
-    RecordTranche& derived,
-    RecordTranche const& base)
-{
-    inheritBaseMembers(derivedId, derived.NamespaceAliases, base.NamespaceAliases);
-    inheritBaseMembers(derivedId, derived.Typedefs, base.Typedefs);
-    inheritBaseMembers(derivedId, derived.Records, base.Records);
-    inheritBaseMembers(derivedId, derived.Enums, base.Enums);
-    inheritBaseMembers(derivedId, derived.Functions, base.Functions);
-    inheritBaseMembers(derivedId, derived.StaticFunctions, base.StaticFunctions);
-    inheritBaseMembers(derivedId, derived.Variables, base.Variables);
-    inheritBaseMembers(derivedId, derived.StaticVariables, base.StaticVariables);
-    inheritBaseMembers(derivedId, derived.Concepts, base.Concepts);
-    inheritBaseMembers(derivedId, derived.Guides, base.Guides);
-}
-
-namespace {
-bool
-shouldCopy(Config const& config, Info const& M)
-{
-    if (config->inheritBaseMembers == PublicSettings::BaseMemberInheritance::CopyDependencies)
-    {
-        return M.Extraction == ExtractionMode::Dependency;
-    }
-    return config->inheritBaseMembers == PublicSettings::BaseMemberInheritance::CopyAll;
+    return AccessKind::None;
 }
 }
 
-void
+void 
 BaseMembersFinalizer::
-inheritBaseMembers(
-    SymbolID const& derivedId,
-    std::vector<SymbolID>& derived,
-    std::vector<SymbolID> const& base)
+inheritBaseMembers(RecordInfo& I, RecordInfo const& B, AccessKind const A)
 {
-    for (SymbolID const& otherID: base)
+    SymbolID const& derivedId = I.id;
+    std::vector<MemberInfo>& derived = I.Members;
+    std::vector<MemberInfo> const& base = B.Members;
+
+    for (auto const& other: base)
     {
+        SymbolID const& otherID = other.id;
+
         // Find the info from the base class
-        MRDOCS_CHECK_OR_CONTINUE(!contains(derived, otherID));
+        MRDOCS_CHECK_OR_CONTINUE(!std::ranges::contains(derived, otherID, &MemberInfo::id));
         Info* otherInfoPtr = corpus_.find(otherID);
         MRDOCS_CHECK_OR_CONTINUE(otherInfoPtr);
         Info& otherInfo = *otherInfoPtr;
@@ -134,7 +105,7 @@ inheritBaseMembers(
                 // For other kinds of members, it's a shadow if the names
                 // are the same
                 return info.Name == otherInfo.Name;
-            });
+            }, &MemberInfo::id);
         MRDOCS_CHECK_OR_CONTINUE(shadowIt == derived.end());
 
         // Not a shadow, so inherit the base member
@@ -148,7 +119,7 @@ inheritBaseMembers(
             // extraction mode to be regular, but that is controversial.
             if (otherInfo.Extraction != ExtractionMode::Dependency)
             {
-                derived.push_back(otherID);
+                derived.emplace_back(effectiveAccess(other.EffectiveAccess, A), other.Kind, otherID);
             }
         }
         else
@@ -163,7 +134,7 @@ inheritBaseMembers(
             otherCopy->id = SymbolID::createFromString(
                 std::format("{}-{}", toBase16Str(otherCopy->Parent),
                             toBase16Str(otherInfo.id)));
-            derived.push_back(otherCopy->id);
+            derived.emplace_back(effectiveAccess(other.EffectiveAccess, A), other.Kind, otherCopy->id);
             // Get the extraction mode from the derived class
             if (otherCopy->Extraction == ExtractionMode::Dependency)
             {
@@ -250,10 +221,22 @@ operator()(RecordInfo& I)
         operator()(*baseRecord);
         inheritBaseMembers(I, *baseRecord, baseI.Access);
     }
-    finalizeRecords(I.Interface.Public.Records);
-    finalizeRecords(I.Interface.Protected.Records);
-    finalizeRecords(I.Interface.Private.Records);
     finalized_.emplace(I.id);
+
+    auto RecordMembers =
+        I.Members | 
+        std::views::filter([this](MemberInfo const& member) {
+            return member.Kind == InfoKind::Record;
+        }) | 
+        std::ranges::views::transform(&MemberInfo::id);
+    for (SymbolID const& memberId: RecordMembers)
+    {
+        Info* infoPtr = corpus_.find(memberId);
+        MRDOCS_CHECK_OR_CONTINUE(infoPtr);
+        auto* record = infoPtr->asRecordPtr();
+        MRDOCS_CHECK_OR_CONTINUE(record);
+        operator()(*record);
+    }
 }
 
 } // clang::mrdocs
diff --git a/src/lib/Metadata/Finalizers/BaseMembersFinalizer.hpp b/src/lib/Metadata/Finalizers/BaseMembersFinalizer.hpp
index 1b6659352..97670bc3a 100644
--- a/src/lib/Metadata/Finalizers/BaseMembersFinalizer.hpp
+++ b/src/lib/Metadata/Finalizers/BaseMembersFinalizer.hpp
@@ -32,25 +32,6 @@ class BaseMembersFinalizer
     void
     inheritBaseMembers(RecordInfo& I, RecordInfo const& B, AccessKind A);
 
-    void
-    inheritBaseMembers(
-        SymbolID const& derivedId,
-        RecordInterface& derived,
-        RecordInterface const& base,
-        AccessKind A);
-
-    void
-    inheritBaseMembers(
-        SymbolID const& derivedId,
-        RecordTranche& derived,
-        RecordTranche const& base);
-
-    void
-    inheritBaseMembers(
-        SymbolID const& derivedId,
-        std::vector<SymbolID>& derived,
-        std::vector<SymbolID> const& base);
-
     void
     finalizeRecords(std::vector<SymbolID> const& ids);
 
diff --git a/src/lib/Metadata/Finalizers/NamespacesFinalizer.cpp b/src/lib/Metadata/Finalizers/NamespacesFinalizer.cpp
index 424f4cebf..99ceba970 100644
--- a/src/lib/Metadata/Finalizers/NamespacesFinalizer.cpp
+++ b/src/lib/Metadata/Finalizers/NamespacesFinalizer.cpp
@@ -49,7 +49,7 @@ operator()(NamespaceInfo& I)
     MRDOCS_CHECK_OR(!I.javadoc, FinalizerResult::None);
 
     // 3) Remove empty undocumented namespaces
-    auto memberIds = allMembers(I);
+    auto&& memberIds = allMembers(I);
     if (std::ranges::empty(memberIds))
     {
         if (!corpus_.config->extractEmptyNamespaces)
diff --git a/src/lib/Metadata/Finalizers/OverloadsFinalizer.cpp b/src/lib/Metadata/Finalizers/OverloadsFinalizer.cpp
index eca1d1096..bda22cb28 100644
--- a/src/lib/Metadata/Finalizers/OverloadsFinalizer.cpp
+++ b/src/lib/Metadata/Finalizers/OverloadsFinalizer.cpp
@@ -32,38 +32,24 @@ findBaseClassPermutation(
         auto const baseRecord = baseInfo->asRecordPtr();
         MRDOCS_CHECK_OR_CONTINUE(baseRecord);
 
-        // Iterate over all function tranches
-        RecordTranche* tranchesPtrs[] = {
-            &baseRecord->Interface.Public,
-            &baseRecord->Interface.Protected,
-            &baseRecord->Interface.Private,
-        };
-        for (RecordTranche* tranchePtr: tranchesPtrs)
+        // Find an overload set that's a permutation of the same
+        // name functions
+        for (auto const& baseMember: baseRecord->Members)
         {
-            std::vector<SymbolID>* trancheFunctionPtrs[] = {
-                &tranchePtr->Functions,
-                &tranchePtr->StaticFunctions
-            };
-            for (std::vector<SymbolID>* trancheFunctionsPtr:
-                 trancheFunctionPtrs)
-            {
-                // Find an overload set that's a permutation of the same
-                // name functions
-                for (SymbolID const& baseID: *trancheFunctionsPtr)
-                {
-                    Info* baseFuncMember = corpus.find(baseID);
-                    MRDOCS_CHECK_OR_CONTINUE(baseFuncMember);
-                    MRDOCS_CHECK_OR_CONTINUE(baseFuncMember->isOverloads());
-                    auto* overloads = baseFuncMember->asOverloadsPtr();
-                    MRDOCS_CHECK_OR_CONTINUE(overloads);
-                    // Does this overload set have the same functions
-                    MRDOCS_CHECK_OR_CONTINUE(
-                        std::ranges::is_permutation(
-                            overloads->Members,
-                            sameNameFunctionIds));
-                    return overloads->id;
-                }
-            }
+            MRDOCS_CHECK_OR_CONTINUE(baseMember.Kind == InfoKind::Function);
+
+            SymbolID const& baseID = baseMember.id;
+            Info* baseFuncMember = corpus.find(baseID);
+            MRDOCS_CHECK_OR_CONTINUE(baseFuncMember);
+            MRDOCS_CHECK_OR_CONTINUE(baseFuncMember->isOverloads());
+            auto* overloads = baseFuncMember->asOverloadsPtr();
+            MRDOCS_CHECK_OR_CONTINUE(overloads);
+            // Does this overload set have the same functions
+            MRDOCS_CHECK_OR_CONTINUE(
+                std::ranges::is_permutation(
+                    overloads->Members,
+                    sameNameFunctionIds));
+            return overloads->id;
         }
     }
     return SymbolID::invalid;
@@ -115,7 +101,7 @@ findIntroducedNamespacePermutation(
 
 void
 OverloadsFinalizer::
-foldOverloads(SymbolID const& contextId, std::vector<SymbolID>& functionIds, bool isStatic)
+foldOverloads(SymbolID const& contextId, std::vector<SymbolID>& functionIds, AccessKind access, bool isStatic)
 {
     Info* contextInfo = corpus_.find(contextId);
     MRDOCS_CHECK_OR(contextInfo);
@@ -232,11 +218,144 @@ foldOverloads(SymbolID const& contextId, std::vector<SymbolID>& functionIds, boo
     }
 }
 
+// FIXME: dedup with above
+void
+OverloadsFinalizer::
+foldOverloads(SymbolID const& contextId, std::vector<MemberInfo>& members)
+{
+    Info* contextInfo = corpus_.find(contextId);
+    MRDOCS_CHECK_OR(contextInfo);
+
+    for (auto memberIt = members.begin();
+         memberIt != members.end();
+         ++memberIt)
+    {
+        MRDOCS_CHECK_OR_CONTINUE(memberIt->Kind == InfoKind::Function);
+
+        // Get the FunctionInfo for the current id
+        auto infoPtr = corpus_.find(memberIt->id);
+        MRDOCS_CHECK_OR_CONTINUE(infoPtr);
+        auto* function = infoPtr->asFunctionPtr();
+        MRDOCS_CHECK_OR_CONTINUE(function);
+
+        AccessKind const access = function->Access;
+        bool const isStatic = (function->StorageClass == StorageClassKind::Static);
+
+        // Check if the FunctionInfo is unique
+        std::ranges::subrange otherMembers(
+            std::next(memberIt),
+            members.end());
+        auto isSameNameFunction = [&](MemberInfo const& other) {
+            MRDOCS_CHECK_OR(other.EffectiveAccess == access, false);
+            MRDOCS_CHECK_OR(other.Kind == InfoKind::Function, false);
+            SymbolID const& otherID = other.id;
+            auto const otherFunctionPtr = corpus_.find(otherID);
+            MRDOCS_CHECK_OR(otherFunctionPtr, false);
+            FunctionInfo const& otherInfo = otherFunctionPtr->asFunction();
+            return function->Name == otherInfo.Name && (isStatic == (otherInfo.StorageClass == StorageClassKind::Static)) ;
+        };
+        auto sameNameIt = std::ranges::
+            find_if(otherMembers, isSameNameFunction);
+        bool const isUniqueFunction = sameNameIt == otherMembers.end();
+        MRDOCS_CHECK_OR_CONTINUE(!isUniqueFunction);
+
+        // Create a list of FunctionInfo overloads
+        auto sameNameMembersView =
+            std::ranges::subrange(memberIt, members.end()) |
+            std::views::filter(isSameNameFunction) |
+            std::views::transform(&MemberInfo::id);
+        SmallVector<SymbolID, 16> sameNameMembers(
+            sameNameMembersView.begin(),
+            sameNameMembersView.end());
+
+        // Check if any of the base classes has an overload set
+        // with the exact same function ids. If that's the case,
+        // the function will create a reference.
+        if (contextInfo->isRecord())
+        {
+            SymbolID equivalentOverloadsID = findBaseClassPermutation(
+                contextId,
+                corpus_,
+                sameNameMembers);
+            if (equivalentOverloadsID)
+            {
+                MRDOCS_ASSERT(corpus_.find(equivalentOverloadsID));
+                // This base overload set becomes the
+                // representation in the record
+                memberIt->id = equivalentOverloadsID;
+                auto const offset = memberIt - members.begin();
+                // Erase the other function ids with
+                // the same name
+                for (SymbolID sameNameId: sameNameMembers)
+                {
+                    std::erase_if(members, [&](MemberInfo const& member) { return member.id == sameNameId; });
+                }
+                memberIt = members.begin() + offset;
+                continue;
+            }
+        }
+
+        // Check if the namespace of the name introduced in the
+        // using declaration has an overload set with the
+        // exact same function ids. If that's the case,
+        // the function will create a reference.
+        if (contextInfo->isUsing())
+        {
+            SymbolID introducedOverloadsID = findIntroducedNamespacePermutation(
+                contextId,
+                corpus_,
+                sameNameMembers);
+            if (introducedOverloadsID)
+            {
+                MRDOCS_ASSERT(corpus_.find(introducedOverloadsID));
+                // This base overload set becomes the
+                // representation in the record
+                memberIt->id = introducedOverloadsID;
+                auto const offset = memberIt - members.begin();
+                // Erase the other function ids with
+                // the same name
+                for (SymbolID sameNameId: sameNameMembers)
+                {
+                    std::erase_if(members, [&](MemberInfo const& member) { return member.id == sameNameId; });
+                }
+                memberIt = members.begin() + offset;
+                continue;
+            }
+        }
+
+        // FunctionInfo is not unique and there's no equivalent
+        // overload set in base classes, so we merge it with the
+        // other FunctionInfos into a new OverloadsInfo
+        OverloadsInfo O(contextId, function->Name, access, isStatic);
+        addMember(O, *function);
+        memberIt->id = O.id;
+        auto const itOffset = memberIt - members.begin();
+        for (auto otherIt = memberIt + 1; otherIt != members.end(); ++otherIt)
+        {
+            MRDOCS_CHECK_OR_CONTINUE(otherIt->EffectiveAccess == access);
+            MRDOCS_CHECK_OR_CONTINUE(otherIt->Kind == InfoKind::Function);
+
+            Info* otherInfoPtr = corpus_.find(otherIt->id);
+            MRDOCS_CHECK_OR_CONTINUE(otherInfoPtr);
+            auto* otherFunction = otherInfoPtr->asFunctionPtr();
+            MRDOCS_CHECK_OR_CONTINUE(otherFunction);
+            MRDOCS_CHECK_OR_CONTINUE(isStatic == (otherFunction->StorageClass == StorageClassKind::Static));
+            if (function->Name == otherFunction->Name)
+            {
+                addMember(O, *otherFunction);
+                otherIt = std::prev(members.erase(otherIt));
+            }
+        }
+        memberIt = members.begin() + itOffset;
+        MRDOCS_ASSERT(corpus_.info_.emplace(std::make_unique<OverloadsInfo>(std::move(O))).second);
+    }
+}
+
 namespace {
-template <class T>
+template <class T, range_of<SymbolID> R>
 constexpr
 auto
-toDerivedView(std::vector<SymbolID> const& ids, CorpusImpl& c)
+toDerivedView(R&& ids, CorpusImpl& c)
 {
     return ids |
        std::views::transform([&c](SymbolID const& id) {
@@ -264,7 +383,7 @@ operator()(NamespaceInfo& I)
     MRDOCS_CHECK_OR(!finalized_.contains(I.id));
     finalized_.emplace(I.id);
 
-    foldOverloads(I.id, I.Members.Functions, true);
+    foldOverloads(I.id, I.Members.Functions, AccessKind::None, true);
     for (RecordInfo& RI: toDerivedView<RecordInfo>(I.Members.Records, corpus_))
     {
         operator()(RI);
@@ -301,19 +420,11 @@ operator()(RecordInfo& I)
         MRDOCS_CHECK_OR(baseRecord);
         operator()(*baseRecord);
     }
-    foldOverloads(I.id, I.Interface.Public.Functions, false);
-    foldOverloads(I.id, I.Interface.Protected.Functions, false);
-    foldOverloads(I.id, I.Interface.Private.Functions, false);
-    foldOverloads(I.id, I.Interface.Public.StaticFunctions, true);
-    foldOverloads(I.id, I.Interface.Protected.StaticFunctions, true);
-    foldOverloads(I.id, I.Interface.Private.StaticFunctions, true);
-    for (RecordInfo& RI: toDerivedView<RecordInfo>(I.Interface.Public.Records, corpus_)) {
-        operator()(RI);
-    }
-    for (RecordInfo& RI: toDerivedView<RecordInfo>(I.Interface.Protected.Records, corpus_)) {
-        operator()(RI);
-    }
-    for (RecordInfo& RI: toDerivedView<RecordInfo>(I.Interface.Private.Records, corpus_)) {
+
+    foldOverloads(I.id, I.Members);
+
+    auto&& memberIds = std::ranges::views::transform(I.Members, &MemberInfo::id);
+    for (RecordInfo& RI: toDerivedView<RecordInfo>(memberIds, corpus_)) {
         operator()(RI);
     }
 }
@@ -340,7 +451,7 @@ operator()(UsingInfo& I)
         }
         break;
     }
-    foldOverloads(I.id, I.ShadowDeclarations, true);
+    foldOverloads(I.id, I.ShadowDeclarations, AccessKind::None, true);
 }
 
 } // clang::mrdocs
diff --git a/src/lib/Metadata/Finalizers/OverloadsFinalizer.hpp b/src/lib/Metadata/Finalizers/OverloadsFinalizer.hpp
index 189417538..575354fee 100644
--- a/src/lib/Metadata/Finalizers/OverloadsFinalizer.hpp
+++ b/src/lib/Metadata/Finalizers/OverloadsFinalizer.hpp
@@ -33,8 +33,14 @@ class OverloadsFinalizer
     foldOverloads(
         SymbolID const& contextId,
         std::vector<SymbolID>& functionIds,
+        AccessKind access,
         bool isStatic);
 
+    void
+    foldOverloads(
+        SymbolID const& contextId,
+        std::vector<MemberInfo>& members);
+
 public:
     OverloadsFinalizer(CorpusImpl& corpus)
         : corpus_(corpus)
diff --git a/src/lib/Metadata/Finalizers/RecordsFinalizer.cpp b/src/lib/Metadata/Finalizers/RecordsFinalizer.cpp
new file mode 100644
index 000000000..b56974ec4
--- /dev/null
+++ b/src/lib/Metadata/Finalizers/RecordsFinalizer.cpp
@@ -0,0 +1,190 @@
+//
+// Licensed under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+// Copyright (c) 2025 Alan de Freitas (alandefreitas@gmail.com)
+//
+// Official repository: https://github.com/cppalliance/mrdocs
+//
+
+#include "RecordsFinalizer.hpp"
+#include <mrdocs/Support/Algorithm.hpp>
+#include <mrdocs/Support/Report.hpp>
+
+namespace clang::mrdocs {
+
+namespace {
+
+void
+addMember(std::vector<SymbolID>& container, Info const& Member)
+{
+    if (!contains(container, Member.id))
+    {
+        container.push_back(Member.id);
+    }
+}
+
+void
+addMember(RecordTranche& T, Info const& Member)
+{
+    if (auto const* U = Member.asNamespaceAliasPtr())
+    {
+        addMember(T.NamespaceAliases, *U);
+        return;
+    }
+    if (auto const* U = Member.asTypedefPtr())
+    {
+        addMember(T.Typedefs, *U);
+        return;
+    }
+    if (auto const* U = Member.asRecordPtr())
+    {
+        addMember(T.Records, *U);
+        return;
+    }
+    if (auto const* U = Member.asEnumPtr())
+    {
+        addMember(T.Enums, *U);
+        return;
+    }
+    if (auto const* U = Member.asFunctionPtr())
+    {
+        if (U->StorageClass != StorageClassKind::Static)
+        {
+            addMember(T.Functions, *U);
+        }
+        else
+        {
+            addMember(T.StaticFunctions, *U);
+        }
+        return;
+    }
+    if (auto const* U = Member.asVariablePtr())
+    {
+        if (U->StorageClass != StorageClassKind::Static)
+        {
+            addMember(T.Variables, *U);
+        }
+        else
+        {
+            addMember(T.StaticVariables, *U);
+        }
+        return;
+    }
+    if (auto const* U = Member.asConceptPtr())
+    {
+        addMember(T.Concepts, *U);
+        return;
+    }
+    if (auto const* U = Member.asGuidePtr())
+    {
+        addMember(T.Guides, *U);
+        return;
+    }
+    if (auto const* U = Member.asUsingPtr())
+    {
+        addMember(T.Usings, *U);
+        return;
+    }
+    if (auto const* U = Member.asOverloadsPtr())
+    {
+        if (U->StorageClass != StorageClassKind::Static)
+        {
+            addMember(T.Functions, *U);
+        }
+        else
+        {
+            addMember(T.StaticFunctions, *U);
+        }
+        return;
+    }
+    report::error("Cannot push {} of type {} into tranche",
+        Member.Name,
+        mrdocs::toString(Member.Kind).c_str());
+}
+
+}
+
+void
+RecordsFinalizer::
+generateRecordInterface(RecordInfo& I)
+{
+    for (auto const& m: I.Members)
+    {
+        Info* infoPtr = corpus_.find(m.id);
+        MRDOCS_CHECK_OR_CONTINUE(infoPtr);
+
+        Info const& Member = *infoPtr;
+        switch (Member.Access)
+        {
+        case AccessKind::Public:
+            addMember(I.Interface.Public, Member);
+            break;
+        case AccessKind::Private:
+            addMember(I.Interface.Private, Member);
+            break;
+        case AccessKind::Protected:
+            addMember(I.Interface.Protected, Member);
+            break;
+        default:
+            MRDOCS_UNREACHABLE();
+        }
+    }
+}
+
+void
+RecordsFinalizer::
+finalizeRecords(std::vector<SymbolID> const& ids)
+{
+    for (SymbolID const& id: ids)
+    {
+        Info* infoPtr = corpus_.find(id);
+        MRDOCS_CHECK_OR_CONTINUE(infoPtr);
+        auto* record = infoPtr->asRecordPtr();
+        MRDOCS_CHECK_OR_CONTINUE(record);
+        operator()(*record);
+    }
+}
+
+void
+RecordsFinalizer::
+finalizeNamespaces(std::vector<SymbolID> const& ids)
+{
+    for (SymbolID const& id: ids)
+    {
+        Info* infoPtr = corpus_.find(id);
+        MRDOCS_CHECK_OR_CONTINUE(infoPtr);
+        auto* ns = infoPtr->asNamespacePtr();
+        MRDOCS_CHECK_OR_CONTINUE(ns);
+        operator()(*ns);
+    }
+}
+
+void
+RecordsFinalizer::
+operator()(NamespaceInfo& I)
+{
+    report::trace(
+        "Generating record interfaces for namespace '{}'",
+        corpus_.Corpus::qualifiedName(I));
+    finalizeRecords(I.Members.Records);
+    finalizeNamespaces(I.Members.Namespaces);
+}
+
+void
+RecordsFinalizer::
+operator()(RecordInfo& I)
+{
+    report::trace(
+        "Generating record interface for record '{}'",
+        corpus_.Corpus::qualifiedName(I));
+    MRDOCS_CHECK_OR(!finalized_.contains(I.id));
+    generateRecordInterface(I);
+    finalizeRecords(I.Interface.Public.Records);
+    finalizeRecords(I.Interface.Protected.Records);
+    finalizeRecords(I.Interface.Private.Records);
+    finalized_.emplace(I.id);
+}
+
+} // clang::mrdocs
diff --git a/src/lib/Metadata/Finalizers/RecordsFinalizer.hpp b/src/lib/Metadata/Finalizers/RecordsFinalizer.hpp
new file mode 100644
index 000000000..95e352fbb
--- /dev/null
+++ b/src/lib/Metadata/Finalizers/RecordsFinalizer.hpp
@@ -0,0 +1,63 @@
+//
+// Licensed under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+// Copyright (c) 2025 Alan de Freitas (alandefreitas@gmail.com)
+//
+// Official repository: https://github.com/cppalliance/mrdocs
+//
+
+#ifndef MRDOCS_LIB_METADATA_FINALIZER_RECORDSFINALIZER_HPP
+#define MRDOCS_LIB_METADATA_FINALIZER_RECORDSFINALIZER_HPP
+
+#include "lib/Metadata/InfoSet.hpp"
+#include "lib/CorpusImpl.hpp"
+
+namespace clang::mrdocs {
+
+/** Finalizes the records in corpus.
+
+    Generates record interfaces.
+*/
+class RecordsFinalizer
+{
+    CorpusImpl& corpus_;
+    std::unordered_set<SymbolID> finalized_;
+
+    void
+    generateRecordInterface(RecordInfo& I);
+
+    void
+    finalizeRecords(std::vector<SymbolID> const& ids);
+
+    void
+    finalizeNamespaces(std::vector<SymbolID> const& ids);
+
+public:
+    RecordsFinalizer(
+        CorpusImpl& corpus)
+        : corpus_(corpus)
+    {}
+
+    void
+    build()
+    {
+        Info* info = corpus_.find(SymbolID::global);
+        MRDOCS_CHECK_OR(info);
+        operator()(info->asNamespace());
+    }
+
+    void
+    operator()(NamespaceInfo& I);
+
+    void
+    operator()(RecordInfo& I);
+
+    void
+    operator()(Info&) {}
+};
+
+} // clang::mrdocs
+
+#endif
diff --git a/src/lib/Metadata/Finalizers/SortMembersFinalizer.cpp b/src/lib/Metadata/Finalizers/SortMembersFinalizer.cpp
index 3045ab1bd..632a2c257 100644
--- a/src/lib/Metadata/Finalizers/SortMembersFinalizer.cpp
+++ b/src/lib/Metadata/Finalizers/SortMembersFinalizer.cpp
@@ -267,51 +267,33 @@ sortMembers(std::vector<SymbolID>& ids)
 
 void
 SortMembersFinalizer::
-sortMembers(NamespaceTranche& T)
+sortMembers(std::vector<MemberInfo>& members)
 {
-    sortMembers(T.Namespaces);
-    sortMembers(T.NamespaceAliases);
-    sortMembers(T.Typedefs);
-    sortMembers(T.Records);
-    sortMembers(T.Enums);
-    sortMembers(T.Functions);
-    sortMembers(T.Variables);
-    sortMembers(T.Concepts);
-    sortMembers(T.Guides);
-    sortMembers(T.Usings);
+    SymbolIDCompareFn const pred{corpus_};
+    std::ranges::sort(members, pred, &MemberInfo::id);
 }
 
 void
 SortMembersFinalizer::
-sortMembers(RecordTranche& T)
+sortMembers(NamespaceTranche& T)
 {
+    sortMembers(T.Namespaces);
     sortMembers(T.NamespaceAliases);
     sortMembers(T.Typedefs);
     sortMembers(T.Records);
     sortMembers(T.Enums);
     sortMembers(T.Functions);
-    sortMembers(T.StaticFunctions);
     sortMembers(T.Variables);
-    sortMembers(T.StaticVariables);
     sortMembers(T.Concepts);
     sortMembers(T.Guides);
     sortMembers(T.Usings);
 }
 
-void
-SortMembersFinalizer::
-sortMembers(RecordInterface& I)
-{
-    sortMembers(I.Public);
-    sortMembers(I.Protected);
-    sortMembers(I.Private);
-}
-
 namespace {
-template <class T>
+template <class T, range_of<SymbolID> R>
 constexpr
 auto
-toDerivedView(std::vector<SymbolID> const& ids, CorpusImpl& c)
+toDerivedView(R&& ids, CorpusImpl& c)
 {
     return ids |
        std::views::transform([&c](SymbolID const& id) {
@@ -361,43 +343,20 @@ operator()(RecordInfo& I)
     // Sort members of all tranches if sorting is enabled for records
     if (corpus_.config->sortMembers)
     {
-        sortMembers(I.Interface);
+        sortMembers(I.Members);
     }
 
     // Recursively sort members of child records and overloads
-    for (RecordInfo& RI: toDerivedView<RecordInfo>(I.Interface.Public.Records, corpus_))
-    {
-        operator()(RI);
-    }
-    for (RecordInfo& RI: toDerivedView<RecordInfo>(I.Interface.Protected.Records, corpus_))
-    {
-        operator()(RI);
-    }
-    for (RecordInfo& RI: toDerivedView<RecordInfo>(I.Interface.Private.Records, corpus_))
-    {
-        operator()(RI);
-    }
-    for (OverloadsInfo& RI: toDerivedView<OverloadsInfo>(I.Interface.Public.Functions, corpus_))
-    {
-        operator()(RI);
-    }
-    for (OverloadsInfo& RI: toDerivedView<OverloadsInfo>(I.Interface.Protected.Functions, corpus_))
-    {
-        operator()(RI);
-    }
-    for (OverloadsInfo& RI: toDerivedView<OverloadsInfo>(I.Interface.Private.Functions, corpus_))
-    {
-        operator()(RI);
-    }
-    for (OverloadsInfo& RI: toDerivedView<OverloadsInfo>(I.Interface.Public.StaticFunctions, corpus_))
+    auto&& memberIds = allMembers(I);
+    for (RecordInfo& RI: toDerivedView<RecordInfo>(memberIds, corpus_))
     {
         operator()(RI);
     }
-    for (OverloadsInfo& RI: toDerivedView<OverloadsInfo>(I.Interface.Protected.StaticFunctions, corpus_))
+    for (OverloadsInfo& RI: toDerivedView<OverloadsInfo>(memberIds, corpus_))
     {
         operator()(RI);
     }
-    for (OverloadsInfo& RI: toDerivedView<OverloadsInfo>(I.Interface.Private.StaticFunctions, corpus_))
+    for (OverloadsInfo& RI: toDerivedView<OverloadsInfo>(memberIds, corpus_))
     {
         operator()(RI);
     }
diff --git a/src/lib/Metadata/Finalizers/SortMembersFinalizer.hpp b/src/lib/Metadata/Finalizers/SortMembersFinalizer.hpp
index be01754d7..62836b9ad 100644
--- a/src/lib/Metadata/Finalizers/SortMembersFinalizer.hpp
+++ b/src/lib/Metadata/Finalizers/SortMembersFinalizer.hpp
@@ -32,10 +32,7 @@ class SortMembersFinalizer
     sortMembers(std::vector<SymbolID>& ids);
 
     void
-    sortMembers(RecordInterface& I);
-
-    void
-    sortMembers(RecordTranche& I);
+    sortMembers(std::vector<MemberInfo>& members);
 
     void
     sortMembers(NamespaceTranche& I);
diff --git a/src/lib/Metadata/Info/Overloads.cpp b/src/lib/Metadata/Info/Overloads.cpp
index fb27ba057..4eb57ce10 100644
--- a/src/lib/Metadata/Info/Overloads.cpp
+++ b/src/lib/Metadata/Info/Overloads.cpp
@@ -26,6 +26,7 @@ OverloadsInfo::OverloadsInfo(SymbolID const &Parent, std::string_view Name,
     : InfoCommonBase(SymbolID::createFromString(std::format(
           "{}-{}-{}-{}", toBase16(Parent), Name, toString(access), isStatic))) {
   this->Parent = Parent;
+  if (isStatic) this->StorageClass = StorageClassKind::Static;
 }
 
 void
diff --git a/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.adoc b/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.adoc
index 37c4a3747..1be136b12 100644
--- a/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.adoc
+++ b/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.adoc
@@ -102,35 +102,35 @@ link:#X-2constructor-06[X](link:#X[X]&& other) = default;
 
 [.small]#link:#X-2constructor-06[_» more&period;&period;&period;_]#
 
-Construct from `int`
+Construct from `A`
 
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-link:#X-2constructor-07[X](int value);
+link:#X-2constructor-0b[X](link:#A[A] const& value);
 ----
 
-[.small]#link:#X-2constructor-07[_» more&period;&period;&period;_]#
+[.small]#link:#X-2constructor-0b[_» more&period;&period;&period;_]#
 
 Construct from `A`
 
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-link:#X-2constructor-0b[X](link:#A[A] const& value);
+link:#X-2constructor-00[X](link:#A[A]&& value);
 ----
 
-[.small]#link:#X-2constructor-0b[_» more&period;&period;&period;_]#
+[.small]#link:#X-2constructor-00[_» more&period;&period;&period;_]#
 
-Construct from `A`
+Construct from `int`
 
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-link:#X-2constructor-00[X](link:#A[A]&& value);
+link:#X-2constructor-07[X](int value);
 ----
 
-[.small]#link:#X-2constructor-00[_» more&period;&period;&period;_]#
+[.small]#link:#X-2constructor-07[_» more&period;&period;&period;_]#
 
 [#X-2constructor-0e8]
 == link:#X[X]::X
@@ -197,10 +197,10 @@ X(link:#X[X]&& other) = default;
 | The object to move construct from
 |===
 
-[#X-2constructor-07]
+[#X-2constructor-0b]
 == link:#X[X]::X
 
-Construct from `int`
+Construct from `A`
 
 === Synopsis
 
@@ -208,7 +208,7 @@ Declared in `&lt;brief&hyphen;from&hyphen;function&hyphen;class&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-X(int value);
+X(link:#A[A] const& value);
 ----
 
 === Parameters
@@ -218,10 +218,10 @@ X(int value);
 | Name
 | Description
 | *value*
-| The value to construct from
+| The object to copy construct from
 |===
 
-[#X-2constructor-0b]
+[#X-2constructor-00]
 == link:#X[X]::X
 
 Construct from `A`
@@ -232,7 +232,7 @@ Declared in `&lt;brief&hyphen;from&hyphen;function&hyphen;class&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-X(link:#A[A] const& value);
+X(link:#A[A]&& value);
 ----
 
 === Parameters
@@ -242,13 +242,13 @@ X(link:#A[A] const& value);
 | Name
 | Description
 | *value*
-| The object to copy construct from
+| The object to move construct from
 |===
 
-[#X-2constructor-00]
+[#X-2constructor-07]
 == link:#X[X]::X
 
-Construct from `A`
+Construct from `int`
 
 === Synopsis
 
@@ -256,7 +256,7 @@ Declared in `&lt;brief&hyphen;from&hyphen;function&hyphen;class&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-X(link:#A[A]&& value);
+X(int value);
 ----
 
 === Parameters
@@ -266,7 +266,7 @@ X(link:#A[A]&& value);
 | Name
 | Description
 | *value*
-| The object to move construct from
+| The value to construct from
 |===
 
 [#X-2destructor]
diff --git a/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.html b/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.html
index c805d70c3..dc362e323 100644
--- a/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.html
+++ b/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.html
@@ -120,13 +120,6 @@ <h3>Synopses</h3>
 </code>
 </pre><span class="small"><a href="#X-2constructor-06"><em>» more...</em></a></span>
 
-<span>Construct from <code>int</code></span>
-<pre>
-<code class="source-code cpp"><a href="#X-2constructor-07">X</a>(int value);
-
-</code>
-</pre><span class="small"><a href="#X-2constructor-07"><em>» more...</em></a></span>
-
 <span>Construct from <code>A</code></span>
 <pre>
 <code class="source-code cpp"><a href="#X-2constructor-0b">X</a>(<a href="#A">A</a> const& value);
@@ -141,6 +134,13 @@ <h3>Synopses</h3>
 </code>
 </pre><span class="small"><a href="#X-2constructor-00"><em>» more...</em></a></span>
 
+<span>Construct from <code>int</code></span>
+<pre>
+<code class="source-code cpp"><a href="#X-2constructor-07">X</a>(int value);
+
+</code>
+</pre><span class="small"><a href="#X-2constructor-07"><em>» more...</em></a></span>
+
 
 </div>
 </div>
@@ -240,9 +240,9 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-07"><a href="#X-2constructor-07">X::X</a></h2>
+<h2 id="X-2constructor-0b"><a href="#X-2constructor-0b">X::X</a></h2>
 <div>
-<span>Construct from <code>int</code></span>
+<span>Construct from <code>A</code></span>
 
 </div>
 </div>
@@ -251,7 +251,7 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;brief-from-function-class.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp">X(int value);
+<code class="source-code cpp">X(<a href="#A">A</a> const& value);
 
 </code>
 </pre>
@@ -268,7 +268,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>value</strong></td>
-<td><span>The value to construct from</span></td>
+<td><span>The object to copy construct from</span></td>
 </tr>
 </tbody>
 </table>
@@ -276,7 +276,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-0b"><a href="#X-2constructor-0b">X::X</a></h2>
+<h2 id="X-2constructor-00"><a href="#X-2constructor-00">X::X</a></h2>
 <div>
 <span>Construct from <code>A</code></span>
 
@@ -287,7 +287,7 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;brief-from-function-class.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp">X(<a href="#A">A</a> const& value);
+<code class="source-code cpp">X(<a href="#A">A</a>&& value);
 
 </code>
 </pre>
@@ -304,7 +304,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>value</strong></td>
-<td><span>The object to copy construct from</span></td>
+<td><span>The object to move construct from</span></td>
 </tr>
 </tbody>
 </table>
@@ -312,9 +312,9 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-00"><a href="#X-2constructor-00">X::X</a></h2>
+<h2 id="X-2constructor-07"><a href="#X-2constructor-07">X::X</a></h2>
 <div>
-<span>Construct from <code>A</code></span>
+<span>Construct from <code>int</code></span>
 
 </div>
 </div>
@@ -323,7 +323,7 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;brief-from-function-class.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp">X(<a href="#A">A</a>&& value);
+<code class="source-code cpp">X(int value);
 
 </code>
 </pre>
@@ -340,7 +340,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>value</strong></td>
-<td><span>The object to move construct from</span></td>
+<td><span>The value to construct from</span></td>
 </tr>
 </tbody>
 </table>
diff --git a/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.xml b/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.xml
index b5be0885a..36278331b 100644
--- a/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.xml
+++ b/test-files/golden-tests/config/auto-function-metadata/brief-from-function-class.xml
@@ -66,21 +66,6 @@
         </param>
       </doc>
     </function>
-    <function class="constructor" name="X" id="d9h3reyOyp3JT3kwQOTPOI9tmzg=">
-      <file short-path="brief-from-function-class.cpp" source-path="brief-from-function-class.cpp" line="13"/>
-      <param name="value">
-        <type name="int"/>
-      </param>
-      <doc>
-        <brief>
-          <text>Construct from </text>
-          <mono>int</mono>
-        </brief>
-        <param name="value">
-          <text>The value to construct from</text>
-        </param>
-      </doc>
-    </function>
     <function class="constructor" name="X" id="vwV8S8Oz6MQV3vNlcR0jdKhSlfc=">
       <file short-path="brief-from-function-class.cpp" source-path="brief-from-function-class.cpp" line="11"/>
       <param name="value">
@@ -115,6 +100,21 @@
         </param>
       </doc>
     </function>
+    <function class="constructor" name="X" id="d9h3reyOyp3JT3kwQOTPOI9tmzg=">
+      <file short-path="brief-from-function-class.cpp" source-path="brief-from-function-class.cpp" line="13"/>
+      <param name="value">
+        <type name="int"/>
+      </param>
+      <doc>
+        <brief>
+          <text>Construct from </text>
+          <mono>int</mono>
+        </brief>
+        <param name="value">
+          <text>The value to construct from</text>
+        </param>
+      </doc>
+    </function>
     <function class="destructor" name="~X" id="HK6hbp0kJrHWxbYoHddN1v/GCWc=">
       <file short-path="brief-from-function-class.cpp" source-path="brief-from-function-class.cpp" line="14"/>
       <doc>
diff --git a/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.adoc b/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.adoc
index 9d407284c..09a4a6c29 100644
--- a/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.adoc
+++ b/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.adoc
@@ -85,35 +85,35 @@ link:#X-2constructor-06[X](link:#X[X]&& other);
 
 [.small]#link:#X-2constructor-06[_» more&period;&period;&period;_]#
 
-Construct from `int`
+Construct from `A`
 
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-link:#X-2constructor-07[X](int value);
+link:#X-2constructor-0b[X](link:#A[A] const& value);
 ----
 
-[.small]#link:#X-2constructor-07[_» more&period;&period;&period;_]#
+[.small]#link:#X-2constructor-0b[_» more&period;&period;&period;_]#
 
 Construct from `A`
 
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-link:#X-2constructor-0b[X](link:#A[A] const& value);
+link:#X-2constructor-00[X](link:#A[A]&& value);
 ----
 
-[.small]#link:#X-2constructor-0b[_» more&period;&period;&period;_]#
+[.small]#link:#X-2constructor-00[_» more&period;&period;&period;_]#
 
-Construct from `A`
+Construct from `int`
 
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-link:#X-2constructor-00[X](link:#A[A]&& value);
+link:#X-2constructor-07[X](int value);
 ----
 
-[.small]#link:#X-2constructor-00[_» more&period;&period;&period;_]#
+[.small]#link:#X-2constructor-07[_» more&period;&period;&period;_]#
 
 [#X-2constructor-0e]
 == link:#X[X]::X
@@ -163,10 +163,10 @@ X(link:#X[X]&& other);
 | The object to move construct from
 |===
 
-[#X-2constructor-07]
+[#X-2constructor-0b]
 == link:#X[X]::X
 
-Construct from `int`
+Construct from `A`
 
 === Synopsis
 
@@ -174,7 +174,7 @@ Declared in `&lt;param&hyphen;from&hyphen;function&hyphen;class&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-X(int value);
+X(link:#A[A] const& value);
 ----
 
 === Parameters
@@ -184,10 +184,10 @@ X(int value);
 | Name
 | Description
 | *value*
-| The value to construct from
+| The object to copy construct from
 |===
 
-[#X-2constructor-0b]
+[#X-2constructor-00]
 == link:#X[X]::X
 
 Construct from `A`
@@ -198,7 +198,7 @@ Declared in `&lt;param&hyphen;from&hyphen;function&hyphen;class&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-X(link:#A[A] const& value);
+X(link:#A[A]&& value);
 ----
 
 === Parameters
@@ -208,13 +208,13 @@ X(link:#A[A] const& value);
 | Name
 | Description
 | *value*
-| The object to copy construct from
+| The object to move construct from
 |===
 
-[#X-2constructor-00]
+[#X-2constructor-07]
 == link:#X[X]::X
 
-Construct from `A`
+Construct from `int`
 
 === Synopsis
 
@@ -222,7 +222,7 @@ Declared in `&lt;param&hyphen;from&hyphen;function&hyphen;class&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-X(link:#A[A]&& value);
+X(int value);
 ----
 
 === Parameters
@@ -232,7 +232,7 @@ X(link:#A[A]&& value);
 | Name
 | Description
 | *value*
-| The object to move construct from
+| The value to construct from
 |===
 
 [#X-operator_assign-0a]
@@ -272,10 +272,10 @@ Assignment operator
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 link:#X[X]&
-link:#X-operator_assign-07f[operator&equals;](int value);
+link:#X-operator_assign-0d[operator&equals;](link:#A[A] const& value);
 ----
 
-[.small]#link:#X-operator_assign-07f[_» more&period;&period;&period;_]#
+[.small]#link:#X-operator_assign-0d[_» more&period;&period;&period;_]#
 
 Assignment operator
 
@@ -283,10 +283,10 @@ Assignment operator
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 link:#X[X]&
-link:#X-operator_assign-0d[operator&equals;](link:#A[A] const& value);
+link:#X-operator_assign-07e[operator&equals;](link:#A[A]&& value);
 ----
 
-[.small]#link:#X-operator_assign-0d[_» more&period;&period;&period;_]#
+[.small]#link:#X-operator_assign-07e[_» more&period;&period;&period;_]#
 
 Assignment operator
 
@@ -294,10 +294,10 @@ Assignment operator
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 link:#X[X]&
-link:#X-operator_assign-07e[operator&equals;](link:#A[A]&& value);
+link:#X-operator_assign-07f[operator&equals;](int value);
 ----
 
-[.small]#link:#X-operator_assign-07e[_» more&period;&period;&period;_]#
+[.small]#link:#X-operator_assign-07f[_» more&period;&period;&period;_]#
 
 [#X-operator_assign-06]
 == link:#X[X]::operator&equals;
@@ -357,7 +357,7 @@ Reference to the current object
 | The object to move assign from
 |===
 
-[#X-operator_assign-07f]
+[#X-operator_assign-0d]
 == link:#X[X]::operator&equals;
 
 Assignment operator
@@ -369,7 +369,7 @@ Declared in `&lt;param&hyphen;from&hyphen;function&hyphen;class&period;cpp&gt;`
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 link:#X[X]&
-operator&equals;(int value);
+operator&equals;(link:#A[A] const& value);
 ----
 
 === Return Value
@@ -383,10 +383,10 @@ Reference to the current object
 | Name
 | Description
 | *value*
-| The value to assign from
+| The object to copy assign from
 |===
 
-[#X-operator_assign-0d]
+[#X-operator_assign-07e]
 == link:#X[X]::operator&equals;
 
 Assignment operator
@@ -398,7 +398,7 @@ Declared in `&lt;param&hyphen;from&hyphen;function&hyphen;class&period;cpp&gt;`
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 link:#X[X]&
-operator&equals;(link:#A[A] const& value);
+operator&equals;(link:#A[A]&& value);
 ----
 
 === Return Value
@@ -412,10 +412,10 @@ Reference to the current object
 | Name
 | Description
 | *value*
-| The object to copy assign from
+| The object to move assign from
 |===
 
-[#X-operator_assign-07e]
+[#X-operator_assign-07f]
 == link:#X[X]::operator&equals;
 
 Assignment operator
@@ -427,7 +427,7 @@ Declared in `&lt;param&hyphen;from&hyphen;function&hyphen;class&period;cpp&gt;`
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 link:#X[X]&
-operator&equals;(link:#A[A]&& value);
+operator&equals;(int value);
 ----
 
 === Return Value
@@ -441,7 +441,7 @@ Reference to the current object
 | Name
 | Description
 | *value*
-| The object to move assign from
+| The value to assign from
 |===
 
 
diff --git a/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.html b/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.html
index bdcfd1f52..d8d17cf7d 100644
--- a/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.html
+++ b/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.html
@@ -108,13 +108,6 @@ <h3>Synopses</h3>
 </code>
 </pre><span class="small"><a href="#X-2constructor-06"><em>» more...</em></a></span>
 
-<span>Construct from <code>int</code></span>
-<pre>
-<code class="source-code cpp"><a href="#X-2constructor-07">X</a>(int value);
-
-</code>
-</pre><span class="small"><a href="#X-2constructor-07"><em>» more...</em></a></span>
-
 <span>Construct from <code>A</code></span>
 <pre>
 <code class="source-code cpp"><a href="#X-2constructor-0b">X</a>(<a href="#A">A</a> const& value);
@@ -129,6 +122,13 @@ <h3>Synopses</h3>
 </code>
 </pre><span class="small"><a href="#X-2constructor-00"><em>» more...</em></a></span>
 
+<span>Construct from <code>int</code></span>
+<pre>
+<code class="source-code cpp"><a href="#X-2constructor-07">X</a>(int value);
+
+</code>
+</pre><span class="small"><a href="#X-2constructor-07"><em>» more...</em></a></span>
+
 
 </div>
 </div>
@@ -206,9 +206,9 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-07"><a href="#X-2constructor-07">X::X</a></h2>
+<h2 id="X-2constructor-0b"><a href="#X-2constructor-0b">X::X</a></h2>
 <div>
-<span>Construct from <code>int</code></span>
+<span>Construct from <code>A</code></span>
 
 </div>
 </div>
@@ -217,7 +217,7 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;param-from-function-class.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp">X(int value);
+<code class="source-code cpp">X(<a href="#A">A</a> const& value);
 
 </code>
 </pre>
@@ -234,7 +234,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>value</strong></td>
-<td><span>The value to construct from</span></td>
+<td><span>The object to copy construct from</span></td>
 </tr>
 </tbody>
 </table>
@@ -242,7 +242,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-0b"><a href="#X-2constructor-0b">X::X</a></h2>
+<h2 id="X-2constructor-00"><a href="#X-2constructor-00">X::X</a></h2>
 <div>
 <span>Construct from <code>A</code></span>
 
@@ -253,7 +253,7 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;param-from-function-class.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp">X(<a href="#A">A</a> const& value);
+<code class="source-code cpp">X(<a href="#A">A</a>&& value);
 
 </code>
 </pre>
@@ -270,7 +270,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>value</strong></td>
-<td><span>The object to copy construct from</span></td>
+<td><span>The object to move construct from</span></td>
 </tr>
 </tbody>
 </table>
@@ -278,9 +278,9 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-2constructor-00"><a href="#X-2constructor-00">X::X</a></h2>
+<h2 id="X-2constructor-07"><a href="#X-2constructor-07">X::X</a></h2>
 <div>
-<span>Construct from <code>A</code></span>
+<span>Construct from <code>int</code></span>
 
 </div>
 </div>
@@ -289,7 +289,7 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;param-from-function-class.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp">X(<a href="#A">A</a>&& value);
+<code class="source-code cpp">X(int value);
 
 </code>
 </pre>
@@ -306,7 +306,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>value</strong></td>
-<td><span>The object to move construct from</span></td>
+<td><span>The value to construct from</span></td>
 </tr>
 </tbody>
 </table>
@@ -343,26 +343,26 @@ <h3>Synopses</h3>
 <span>Assignment operator</span>
 <pre>
 <code class="source-code cpp"><a href="#X">X</a>&
-<a href="#X-operator_assign-07f">operator&#x3D;</a>(int value);
+<a href="#X-operator_assign-0d">operator&#x3D;</a>(<a href="#A">A</a> const& value);
 
 </code>
-</pre><span class="small"><a href="#X-operator_assign-07f"><em>» more...</em></a></span>
+</pre><span class="small"><a href="#X-operator_assign-0d"><em>» more...</em></a></span>
 
 <span>Assignment operator</span>
 <pre>
 <code class="source-code cpp"><a href="#X">X</a>&
-<a href="#X-operator_assign-0d">operator&#x3D;</a>(<a href="#A">A</a> const& value);
+<a href="#X-operator_assign-07e">operator&#x3D;</a>(<a href="#A">A</a>&& value);
 
 </code>
-</pre><span class="small"><a href="#X-operator_assign-0d"><em>» more...</em></a></span>
+</pre><span class="small"><a href="#X-operator_assign-07e"><em>» more...</em></a></span>
 
 <span>Assignment operator</span>
 <pre>
 <code class="source-code cpp"><a href="#X">X</a>&
-<a href="#X-operator_assign-07e">operator&#x3D;</a>(<a href="#A">A</a>&& value);
+<a href="#X-operator_assign-07f">operator&#x3D;</a>(int value);
 
 </code>
-</pre><span class="small"><a href="#X-operator_assign-07e"><em>» more...</em></a></span>
+</pre><span class="small"><a href="#X-operator_assign-07f"><em>» more...</em></a></span>
 
 
 </div>
@@ -451,7 +451,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_assign-07f"><a href="#X-operator_assign-07f">X::operator&#x3D;</a></h2>
+<h2 id="X-operator_assign-0d"><a href="#X-operator_assign-0d">X::operator&#x3D;</a></h2>
 <div>
 <span>Assignment operator</span>
 
@@ -463,7 +463,7 @@ <h3>Synopsis</h3>
 Declared in <code>&lt;param-from-function-class.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp"><a href="#X">X</a>&
-operator&#x3D;(int value);
+operator&#x3D;(<a href="#A">A</a> const& value);
 
 </code>
 </pre>
@@ -484,7 +484,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>value</strong></td>
-<td><span>The value to assign from</span></td>
+<td><span>The object to copy assign from</span></td>
 </tr>
 </tbody>
 </table>
@@ -492,7 +492,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_assign-0d"><a href="#X-operator_assign-0d">X::operator&#x3D;</a></h2>
+<h2 id="X-operator_assign-07e"><a href="#X-operator_assign-07e">X::operator&#x3D;</a></h2>
 <div>
 <span>Assignment operator</span>
 
@@ -504,7 +504,7 @@ <h3>Synopsis</h3>
 Declared in <code>&lt;param-from-function-class.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp"><a href="#X">X</a>&
-operator&#x3D;(<a href="#A">A</a> const& value);
+operator&#x3D;(<a href="#A">A</a>&& value);
 
 </code>
 </pre>
@@ -525,7 +525,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>value</strong></td>
-<td><span>The object to copy assign from</span></td>
+<td><span>The object to move assign from</span></td>
 </tr>
 </tbody>
 </table>
@@ -533,7 +533,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="X-operator_assign-07e"><a href="#X-operator_assign-07e">X::operator&#x3D;</a></h2>
+<h2 id="X-operator_assign-07f"><a href="#X-operator_assign-07f">X::operator&#x3D;</a></h2>
 <div>
 <span>Assignment operator</span>
 
@@ -545,7 +545,7 @@ <h3>Synopsis</h3>
 Declared in <code>&lt;param-from-function-class.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp"><a href="#X">X</a>&
-operator&#x3D;(<a href="#A">A</a>&& value);
+operator&#x3D;(int value);
 
 </code>
 </pre>
@@ -566,7 +566,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>value</strong></td>
-<td><span>The object to move assign from</span></td>
+<td><span>The value to assign from</span></td>
 </tr>
 </tbody>
 </table>
diff --git a/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.xml b/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.xml
index 09bd6cf95..77fe32511 100644
--- a/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.xml
+++ b/test-files/golden-tests/config/auto-function-metadata/param-from-function-class.xml
@@ -49,21 +49,6 @@
         </param>
       </doc>
     </function>
-    <function class="constructor" name="X" id="d9h3reyOyp3JT3kwQOTPOI9tmzg=">
-      <file short-path="param-from-function-class.cpp" source-path="param-from-function-class.cpp" line="16"/>
-      <param name="value">
-        <type name="int"/>
-      </param>
-      <doc>
-        <brief>
-          <text>Construct from </text>
-          <mono>int</mono>
-        </brief>
-        <param name="value">
-          <text>The value to construct from</text>
-        </param>
-      </doc>
-    </function>
     <function class="constructor" name="X" id="vwV8S8Oz6MQV3vNlcR0jdKhSlfc=">
       <file short-path="param-from-function-class.cpp" source-path="param-from-function-class.cpp" line="12"/>
       <param name="value">
@@ -98,6 +83,21 @@
         </param>
       </doc>
     </function>
+    <function class="constructor" name="X" id="d9h3reyOyp3JT3kwQOTPOI9tmzg=">
+      <file short-path="param-from-function-class.cpp" source-path="param-from-function-class.cpp" line="16"/>
+      <param name="value">
+        <type name="int"/>
+      </param>
+      <doc>
+        <brief>
+          <text>Construct from </text>
+          <mono>int</mono>
+        </brief>
+        <param name="value">
+          <text>The value to construct from</text>
+        </param>
+      </doc>
+    </function>
     <function name="operator=" id="YI7e/5S7mfio0SdtBRI7qUu9Q98=">
       <file short-path="param-from-function-class.cpp" source-path="param-from-function-class.cpp" line="18"/>
       <attr id="operator" name="assign" value="14"/>
@@ -148,8 +148,8 @@
         </param>
       </doc>
     </function>
-    <function name="operator=" id="fxM82tl72Q717PPJyP3nb48HbSQ=">
-      <file short-path="param-from-function-class.cpp" source-path="param-from-function-class.cpp" line="30"/>
+    <function name="operator=" id="3QxkEc/c2ugz6330u92HdqOoDNk=">
+      <file short-path="param-from-function-class.cpp" source-path="param-from-function-class.cpp" line="24"/>
       <attr id="operator" name="assign" value="14"/>
       <return>
         <type class="lvalue-reference">
@@ -157,7 +157,9 @@
         </type>
       </return>
       <param name="value">
-        <type name="int"/>
+        <type class="lvalue-reference">
+          <pointee-type id="YrPSaKAbmXgzCAX5WByx4eVoqBM=" name="A" cv-qualifiers="const"/>
+        </type>
       </param>
       <doc>
         <brief>
@@ -167,12 +169,12 @@
           <text>Reference to the current object</text>
         </returns>
         <param name="value">
-          <text>The value to assign from</text>
+          <text>The object to copy assign from</text>
         </param>
       </doc>
     </function>
-    <function name="operator=" id="3QxkEc/c2ugz6330u92HdqOoDNk=">
-      <file short-path="param-from-function-class.cpp" source-path="param-from-function-class.cpp" line="24"/>
+    <function name="operator=" id="fj22HhjPEq+Xg/+Qrr3suU+8qMs=">
+      <file short-path="param-from-function-class.cpp" source-path="param-from-function-class.cpp" line="27"/>
       <attr id="operator" name="assign" value="14"/>
       <return>
         <type class="lvalue-reference">
@@ -180,8 +182,8 @@
         </type>
       </return>
       <param name="value">
-        <type class="lvalue-reference">
-          <pointee-type id="YrPSaKAbmXgzCAX5WByx4eVoqBM=" name="A" cv-qualifiers="const"/>
+        <type class="rvalue-reference">
+          <pointee-type id="YrPSaKAbmXgzCAX5WByx4eVoqBM=" name="A"/>
         </type>
       </param>
       <doc>
@@ -192,12 +194,12 @@
           <text>Reference to the current object</text>
         </returns>
         <param name="value">
-          <text>The object to copy assign from</text>
+          <text>The object to move assign from</text>
         </param>
       </doc>
     </function>
-    <function name="operator=" id="fj22HhjPEq+Xg/+Qrr3suU+8qMs=">
-      <file short-path="param-from-function-class.cpp" source-path="param-from-function-class.cpp" line="27"/>
+    <function name="operator=" id="fxM82tl72Q717PPJyP3nb48HbSQ=">
+      <file short-path="param-from-function-class.cpp" source-path="param-from-function-class.cpp" line="30"/>
       <attr id="operator" name="assign" value="14"/>
       <return>
         <type class="lvalue-reference">
@@ -205,9 +207,7 @@
         </type>
       </return>
       <param name="value">
-        <type class="rvalue-reference">
-          <pointee-type id="YrPSaKAbmXgzCAX5WByx4eVoqBM=" name="A"/>
-        </type>
+        <type name="int"/>
       </param>
       <doc>
         <brief>
@@ -217,7 +217,7 @@
           <text>Reference to the current object</text>
         </returns>
         <param name="value">
-          <text>The object to move assign from</text>
+          <text>The value to assign from</text>
         </param>
       </doc>
     </function>
diff --git a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.adoc b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.adoc
index c09ad5f58..41806eeb8 100644
--- a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.adoc
+++ b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.adoc
@@ -61,8 +61,6 @@ class base
 | This function should shadow the excluded&lowbar;base function&period;
 | link:#base-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should be shadowed by derived classes&period;
-| link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
-| This function should be indirectly inherited by derived classes&period;
 |===
 
 === Protected Member Functions
@@ -71,6 +69,8 @@ class base
 |===
 | Name
 | Description
+| link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
 | link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
@@ -225,6 +225,14 @@ class base&lowbar;base;
 | Description
 | link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
+|===
+
+=== Protected Member Functions
+
+[cols=2]
+|===
+| Name
+| Description
 | link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 |===
@@ -319,10 +327,6 @@ class derived
 | This function should shadow the excluded&lowbar;base function&period;
 | link:#derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
-| link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
-| This function should be indirectly inherited by derived classes&period;
-| link:#derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
-| This function should shadow the base class function&period;
 | link:#derived-excluded_inherited[`excluded&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 |===
@@ -333,12 +337,14 @@ class derived
 |===
 | Name
 | Description
+| link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
 | link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
 | This function should shadow the excluded&lowbar;base function&period;
-| link:#base-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
-| This function should be shadowed by derived classes&period;
+| link:#derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
+| This function should shadow the base class function&period;
 | link:#derived-do_excluded_inherited[`do&lowbar;excluded&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#derived-do_shadowed[`do&lowbar;shadowed`] 
@@ -364,10 +370,10 @@ derived&lowbar;shadowed();
 
 A class that derives from base and excluded&lowbar;base
 
-[#derived-do_derived_shadowed]
-== link:#derived[derived]::do&lowbar;derived&lowbar;shadowed
+[#derived-excluded_inherited]
+== link:#derived[derived]::excluded&lowbar;inherited
 
-This function should shadow the base class function&period;
+This function should be inherited by derived classes&period;
 
 === Synopsis
 
@@ -375,18 +381,14 @@ Declared in `&lt;copy&hyphen;dependencies&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-link:#derived[derived]&
-do&lowbar;derived&lowbar;shadowed();
+excluded&lowbar;base&
+excluded&lowbar;inherited();
 ----
 
-=== Return Value
-
-A class that derives from base and excluded&lowbar;base
-
-[#derived-excluded_inherited]
-== link:#derived[derived]::excluded&lowbar;inherited
+[#derived-do_derived_shadowed]
+== link:#derived[derived]::do&lowbar;derived&lowbar;shadowed
 
-This function should be inherited by derived classes&period;
+This function should shadow the base class function&period;
 
 === Synopsis
 
@@ -394,10 +396,14 @@ Declared in `&lt;copy&hyphen;dependencies&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-excluded&lowbar;base&
-excluded&lowbar;inherited();
+link:#derived[derived]&
+do&lowbar;derived&lowbar;shadowed();
 ----
 
+=== Return Value
+
+A class that derives from base and excluded&lowbar;base
+
 [#derived-do_excluded_inherited]
 == link:#derived[derived]::do&lowbar;excluded&lowbar;inherited
 
@@ -450,10 +456,36 @@ class private&lowbar;derived
 |===
 | Name
 | Description
+| link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
+| link:#base-base_inherited[`base&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+| link:#base-base_shadowed[`base&lowbar;shadowed`] 
+| This function should shadow the excluded&lowbar;base function&period;
 | link:#private_derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
+| link:#private_derived-excluded_inherited[`excluded&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+|===
+
+=== Protected Member Functions
+
+[cols=2]
+|===
+| Name
+| Description
+| link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
+| link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+| link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
+| This function should shadow the excluded&lowbar;base function&period;
 | link:#private_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
+| link:#private_derived-do_excluded_inherited[`do&lowbar;excluded&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+| link:#private_derived-do_shadowed[`do&lowbar;shadowed`] 
+| This function should be shadowed by derived classes&period;
 |===
 
 [#private_derived-derived_shadowed]
@@ -475,6 +507,21 @@ derived&lowbar;shadowed();
 
 A class that uses private inheritance only
 
+[#private_derived-excluded_inherited]
+== link:#private_derived[private&lowbar;derived]::excluded&lowbar;inherited
+
+This function should be inherited by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;copy&hyphen;dependencies&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+excluded&lowbar;base&
+excluded&lowbar;inherited();
+----
+
 [#private_derived-do_derived_shadowed]
 == link:#private_derived[private&lowbar;derived]::do&lowbar;derived&lowbar;shadowed
 
@@ -494,6 +541,36 @@ do&lowbar;derived&lowbar;shadowed();
 
 A class that uses private inheritance only
 
+[#private_derived-do_excluded_inherited]
+== link:#private_derived[private&lowbar;derived]::do&lowbar;excluded&lowbar;inherited
+
+This function should be inherited by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;copy&hyphen;dependencies&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+excluded&lowbar;base&
+do&lowbar;excluded&lowbar;inherited();
+----
+
+[#private_derived-do_shadowed]
+== link:#private_derived[private&lowbar;derived]::do&lowbar;shadowed
+
+This function should be shadowed by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;copy&hyphen;dependencies&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+excluded&lowbar;base&
+do&lowbar;shadowed();
+----
+
 [#protected_derived]
 == protected&lowbar;derived
 
@@ -528,10 +605,16 @@ class protected&lowbar;derived
 |===
 | Name
 | Description
+| link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
+| link:#base-base_inherited[`base&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+| link:#base-base_shadowed[`base&lowbar;shadowed`] 
+| This function should shadow the excluded&lowbar;base function&period;
 | link:#protected_derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
-| link:#protected_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
-| This function should shadow the base class function&period;
+| link:#protected_derived-excluded_inherited[`excluded&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
 |===
 
 === Protected Member Functions
@@ -540,28 +623,18 @@ class protected&lowbar;derived
 |===
 | Name
 | Description
-| link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
-| This function should be indirectly inherited by derived classes&period;
-| link:#base-base_inherited[`base&lowbar;inherited`] 
-| This function should be inherited by derived classes&period;
-| link:#base-base_shadowed[`base&lowbar;shadowed`] 
-| This function should shadow the excluded&lowbar;base function&period;
-| link:#base-derived_shadowed[`derived&lowbar;shadowed`] 
-| This function should be shadowed by derived classes&period;
 | link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 | link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
 | This function should shadow the excluded&lowbar;base function&period;
-| link:#base-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
-| This function should be shadowed by derived classes&period;
+| link:#protected_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
+| This function should shadow the base class function&period;
 | link:#protected_derived-do_excluded_inherited[`do&lowbar;excluded&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#protected_derived-do_shadowed[`do&lowbar;shadowed`] 
 | This function should be shadowed by derived classes&period;
-| link:#protected_derived-excluded_inherited[`excluded&lowbar;inherited`] 
-| This function should be inherited by derived classes&period;
 |===
 
 [#protected_derived-derived_shadowed]
@@ -583,6 +656,21 @@ derived&lowbar;shadowed();
 
 A class that should inherit functions as protected&period;
 
+[#protected_derived-excluded_inherited]
+== link:#protected_derived[protected&lowbar;derived]::excluded&lowbar;inherited
+
+This function should be inherited by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;copy&hyphen;dependencies&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+excluded&lowbar;base&
+excluded&lowbar;inherited();
+----
+
 [#protected_derived-do_derived_shadowed]
 == link:#protected_derived[protected&lowbar;derived]::do&lowbar;derived&lowbar;shadowed
 
@@ -632,20 +720,5 @@ excluded&lowbar;base&
 do&lowbar;shadowed();
 ----
 
-[#protected_derived-excluded_inherited]
-== link:#protected_derived[protected&lowbar;derived]::excluded&lowbar;inherited
-
-This function should be inherited by derived classes&period;
-
-=== Synopsis
-
-Declared in `&lt;copy&hyphen;dependencies&period;cpp&gt;`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-excluded&lowbar;base&
-excluded&lowbar;inherited();
-----
-
 
 [.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.cpp b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.cpp
index eff6deaf5..0a5efa42c 100644
--- a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.cpp
+++ b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.cpp
@@ -21,7 +21,7 @@ class base_base {
 public:
     /// This function should be indirectly inherited by derived classes.
     base_base& base_base_inherited();
-public:
+protected:
     /// This function should be indirectly inherited by derived classes.
     base_base& do_base_base_inherited();
 };
@@ -54,7 +54,7 @@ class derived
 public:
     /// This function should shadow the base class function.
     derived& derived_shadowed();
-public:
+protected:
     /// This function should shadow the base class function.
     derived& do_derived_shadowed();
 };
@@ -67,7 +67,7 @@ class protected_derived
 public:
     /// This function should shadow the base class function.
     protected_derived& derived_shadowed();
-public:
+protected:
     /// This function should shadow the base class function.
     protected_derived& do_derived_shadowed();
 };
@@ -80,7 +80,7 @@ class private_derived
 public:
     /// This function should shadow the base class function.
     private_derived& derived_shadowed();
-public:
+protected:
     /// This function should shadow the base class function.
     private_derived& do_derived_shadowed();
 };
diff --git a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.html b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.html
index a1576424a..5d132faa4 100644
--- a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.html
+++ b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.html
@@ -74,8 +74,7 @@ <h2>Member Functions</h2>
 <td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#base-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
-<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
+<td><a href="#base-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
 </tbody>
 </table>
 
@@ -90,6 +89,7 @@ <h2>Protected Member Functions</h2>
 </thead>
 <tbody>
 <tr>
+<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
 <td><a href="#base-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
@@ -285,12 +285,25 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
-<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
+<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
 </tbody>
 </table>
 
 
+<h2>Protected Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
+</tbody>
+</table>
+
 
 <div>
 <h2>Derived Classes</h2>
@@ -405,8 +418,6 @@ <h2>Member Functions</h2>
 <td><a href="#base-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
 <td><a href="#derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
-<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
-<td><a href="#derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
 <td><a href="#derived-excluded_inherited"><code>excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr>
 </tbody>
 </table>
@@ -422,9 +433,10 @@ <h2>Protected Member Functions</h2>
 </thead>
 <tbody>
 <tr>
+<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#base-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
+<td><a href="#derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
 <td><a href="#derived-do_excluded_inherited"><code>do_excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#derived-do_shadowed"><code>do_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
 </tbody>
@@ -458,9 +470,9 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_derived_shadowed"><a href="#derived-do_derived_shadowed">derived::do_derived_shadowed</a></h2>
+<h2 id="derived-excluded_inherited"><a href="#derived-excluded_inherited">derived::excluded_inherited</a></h2>
 <div>
-<span>This function should shadow the base class function.</span>
+<span>This function should be inherited by derived classes.</span>
 
 </div>
 </div>
@@ -469,22 +481,18 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;copy-dependencies.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp"><a href="#derived">derived</a>&
-do_derived_shadowed();
+<code class="source-code cpp">excluded_base&
+excluded_inherited();
 
 </code>
 </pre>
 </div>
-<div>
-<h3>Return Value</h3>
-<span>A class that derives from base and excluded_base</span>
-</div>
 </div>
 <div>
 <div>
-<h2 id="derived-excluded_inherited"><a href="#derived-excluded_inherited">derived::excluded_inherited</a></h2>
+<h2 id="derived-do_derived_shadowed"><a href="#derived-do_derived_shadowed">derived::do_derived_shadowed</a></h2>
 <div>
-<span>This function should be inherited by derived classes.</span>
+<span>This function should shadow the base class function.</span>
 
 </div>
 </div>
@@ -493,12 +501,16 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;copy-dependencies.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp">excluded_base&
-excluded_inherited();
+<code class="source-code cpp"><a href="#derived">derived</a>&
+do_derived_shadowed();
 
 </code>
 </pre>
 </div>
+<div>
+<h3>Return Value</h3>
+<span>A class that derives from base and excluded_base</span>
+</div>
 </div>
 <div>
 <div>
@@ -570,12 +582,34 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
+<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
+<td><a href="#base-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
+<td><a href="#base-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
 <td><a href="#private_derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
-<td><a href="#private_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
+<td><a href="#private_derived-excluded_inherited"><code>excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr>
 </tbody>
 </table>
 
 
+<h2>Protected Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
+<td><a href="#base-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
+<td><a href="#base-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
+<td><a href="#private_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
+<td><a href="#private_derived-do_excluded_inherited"><code>do_excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
+<td><a href="#private_derived-do_shadowed"><code>do_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
+</tbody>
+</table>
+
 
 </div>
 <div>
@@ -604,6 +638,26 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
+<h2 id="private_derived-excluded_inherited"><a href="#private_derived-excluded_inherited">private_derived::excluded_inherited</a></h2>
+<div>
+<span>This function should be inherited by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;copy-dependencies.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">excluded_base&
+excluded_inherited();
+
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
 <h2 id="private_derived-do_derived_shadowed"><a href="#private_derived-do_derived_shadowed">private_derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
@@ -628,6 +682,46 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
+<h2 id="private_derived-do_excluded_inherited"><a href="#private_derived-do_excluded_inherited">private_derived::do_excluded_inherited</a></h2>
+<div>
+<span>This function should be inherited by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;copy-dependencies.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">excluded_base&
+do_excluded_inherited();
+
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
+<h2 id="private_derived-do_shadowed"><a href="#private_derived-do_shadowed">private_derived::do_shadowed</a></h2>
+<div>
+<span>This function should be shadowed by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;copy-dependencies.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">excluded_base&
+do_shadowed();
+
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
 <h2 id="protected_derived"><a href="#protected_derived">protected_derived</a></h2>
 <div>
 <span>A class that should inherit functions as protected.</span>
@@ -671,8 +765,11 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
+<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
+<td><a href="#base-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
+<td><a href="#base-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
 <td><a href="#protected_derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
-<td><a href="#protected_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
+<td><a href="#protected_derived-excluded_inherited"><code>excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr>
 </tbody>
 </table>
 
@@ -687,17 +784,12 @@ <h2>Protected Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
-<td><a href="#base-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
-<td><a href="#base-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#base-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
 <td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#base-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
+<td><a href="#protected_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
 <td><a href="#protected_derived-do_excluded_inherited"><code>do_excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
-<td><a href="#protected_derived-do_shadowed"><code>do_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
-<td><a href="#protected_derived-excluded_inherited"><code>excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr>
+<td><a href="#protected_derived-do_shadowed"><code>do_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
 </tbody>
 </table>
 
@@ -729,9 +821,9 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_derived_shadowed"><a href="#protected_derived-do_derived_shadowed">protected_derived::do_derived_shadowed</a></h2>
+<h2 id="protected_derived-excluded_inherited"><a href="#protected_derived-excluded_inherited">protected_derived::excluded_inherited</a></h2>
 <div>
-<span>This function should shadow the base class function.</span>
+<span>This function should be inherited by derived classes.</span>
 
 </div>
 </div>
@@ -740,22 +832,18 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;copy-dependencies.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp"><a href="#protected_derived">protected_derived</a>&
-do_derived_shadowed();
+<code class="source-code cpp">excluded_base&
+excluded_inherited();
 
 </code>
 </pre>
 </div>
-<div>
-<h3>Return Value</h3>
-<span>A class that should inherit functions as protected.</span>
-</div>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_excluded_inherited"><a href="#protected_derived-do_excluded_inherited">protected_derived::do_excluded_inherited</a></h2>
+<h2 id="protected_derived-do_derived_shadowed"><a href="#protected_derived-do_derived_shadowed">protected_derived::do_derived_shadowed</a></h2>
 <div>
-<span>This function should be inherited by derived classes.</span>
+<span>This function should shadow the base class function.</span>
 
 </div>
 </div>
@@ -764,18 +852,22 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;copy-dependencies.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp">excluded_base&
-do_excluded_inherited();
+<code class="source-code cpp"><a href="#protected_derived">protected_derived</a>&
+do_derived_shadowed();
 
 </code>
 </pre>
 </div>
+<div>
+<h3>Return Value</h3>
+<span>A class that should inherit functions as protected.</span>
+</div>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_shadowed"><a href="#protected_derived-do_shadowed">protected_derived::do_shadowed</a></h2>
+<h2 id="protected_derived-do_excluded_inherited"><a href="#protected_derived-do_excluded_inherited">protected_derived::do_excluded_inherited</a></h2>
 <div>
-<span>This function should be shadowed by derived classes.</span>
+<span>This function should be inherited by derived classes.</span>
 
 </div>
 </div>
@@ -785,7 +877,7 @@ <h3>Synopsis</h3>
 Declared in <code>&lt;copy-dependencies.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">excluded_base&
-do_shadowed();
+do_excluded_inherited();
 
 </code>
 </pre>
@@ -793,9 +885,9 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-excluded_inherited"><a href="#protected_derived-excluded_inherited">protected_derived::excluded_inherited</a></h2>
+<h2 id="protected_derived-do_shadowed"><a href="#protected_derived-do_shadowed">protected_derived::do_shadowed</a></h2>
 <div>
-<span>This function should be inherited by derived classes.</span>
+<span>This function should be shadowed by derived classes.</span>
 
 </div>
 </div>
@@ -805,7 +897,7 @@ <h3>Synopsis</h3>
 Declared in <code>&lt;copy-dependencies.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">excluded_base&
-excluded_inherited();
+do_shadowed();
 
 </code>
 </pre>
diff --git a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.xml b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.xml
index 518a2a8f4..6c0849107 100644
--- a/test-files/golden-tests/config/inherit-base-members/copy-dependencies.xml
+++ b/test-files/golden-tests/config/inherit-base-members/copy-dependencies.xml
@@ -76,7 +76,7 @@
         </returns>
       </doc>
     </function>
-    <function name="do_base_base_inherited" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
+    <function name="do_base_base_inherited" access="protected" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
       <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="26"/>
       <return>
         <type class="lvalue-reference">
@@ -164,7 +164,7 @@
         </returns>
       </doc>
     </function>
-    <function name="do_base_base_inherited" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
+    <function name="do_base_base_inherited" access="protected" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
       <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="26"/>
       <return>
         <type class="lvalue-reference">
@@ -258,51 +258,35 @@
         </returns>
       </doc>
     </function>
-    <function name="do_base_base_inherited" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
-      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="26"/>
+    <function name="excluded_inherited" id="P1Eq799RJkNMSTci+0jy+ZejsyU=">
+      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="9"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=" name="base_base"/>
+          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should be indirectly inherited by derived classes.</text>
+          <text>This function should be inherited by derived classes.</text>
         </brief>
-        <returns>
-          <text>A second-order base class to test indirect inheritance</text>
-        </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" id="rTSnS8Pv8GoWusQQE42y0pgN4cw=">
-      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="59"/>
+    <function name="do_base_base_inherited" access="protected" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
+      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="26"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="ABxWcxit2TyVLv16ZxoJKAc6LKw=" name="derived"/>
+          <pointee-type id="/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=" name="base_base"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should shadow the base class function.</text>
+          <text>This function should be indirectly inherited by derived classes.</text>
         </brief>
         <returns>
-          <text>A class that derives from base and excluded_base</text>
+          <text>A second-order base class to test indirect inheritance</text>
         </returns>
       </doc>
     </function>
-    <function name="excluded_inherited" id="P1Eq799RJkNMSTci+0jy+ZejsyU=">
-      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="9"/>
-      <return>
-        <type class="lvalue-reference">
-          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
-        </type>
-      </return>
-      <doc>
-        <brief>
-          <text>This function should be inherited by derived classes.</text>
-        </brief>
-      </doc>
-    </function>
     <function name="do_base_inherited" access="protected" id="TaKAQiDmx8UXkT9p/momqiOZyHU=">
       <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="46"/>
       <return>
@@ -335,19 +319,19 @@
         </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" access="protected" id="KGOrnDVJV2nPDK1hlkvBm6diYXY=">
-      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="42"/>
+    <function name="do_derived_shadowed" access="protected" id="rTSnS8Pv8GoWusQQE42y0pgN4cw=">
+      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="59"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+          <pointee-type id="ABxWcxit2TyVLv16ZxoJKAc6LKw=" name="derived"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should be shadowed by derived classes.</text>
+          <text>This function should shadow the base class function.</text>
         </brief>
         <returns>
-          <text>A base class to test inheritance and shadowing</text>
+          <text>A class that derives from base and excluded_base</text>
         </returns>
       </doc>
     </function>
@@ -391,6 +375,54 @@
         <text>A class that uses private inheritance only</text>
       </brief>
     </doc>
+    <function name="base_base_inherited" id="2D7yc6q3buDhuPwzpn4pWzbu8ls=">
+      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="23"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=" name="base_base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be indirectly inherited by derived classes.</text>
+        </brief>
+        <returns>
+          <text>A second-order base class to test indirect inheritance</text>
+        </returns>
+      </doc>
+    </function>
+    <function name="base_inherited" id="v0BroyWjs67MHzc1SyTlXrSxn8M=">
+      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="39"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be inherited by derived classes.</text>
+        </brief>
+        <returns>
+          <text>A base class to test inheritance and shadowing</text>
+        </returns>
+      </doc>
+    </function>
+    <function name="base_shadowed" id="ECBBLxlaKar55qA0k1BCFn6MdH8=">
+      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="37"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should shadow the excluded_base function.</text>
+        </brief>
+        <returns>
+          <text>A base class to test inheritance and shadowing</text>
+        </returns>
+      </doc>
+    </function>
     <function name="derived_shadowed" id="9wqRoOH7cwNhkz5vwpTHLeb01BY=">
       <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="82"/>
       <return>
@@ -407,57 +439,72 @@
         </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" id="NJYWKnKWmizdaSr1ldC7FGh7fD0=">
-      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="85"/>
+    <function name="excluded_inherited" id="GZtztJDtmlpSfr66pbZ66w0XBRY=">
+      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="9"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="aiF6nWGZXbG8UfC75J5tNuoPMRc=" name="private_derived"/>
+          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should shadow the base class function.</text>
+          <text>This function should be inherited by derived classes.</text>
+        </brief>
+      </doc>
+    </function>
+    <function name="do_base_base_inherited" access="protected" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
+      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="26"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=" name="base_base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be indirectly inherited by derived classes.</text>
         </brief>
         <returns>
-          <text>A class that uses private inheritance only</text>
+          <text>A second-order base class to test indirect inheritance</text>
         </returns>
       </doc>
     </function>
-  </class>
-  <class name="protected_derived" id="KpfFXd3FeSffU3rGswegSIkkCrM=">
-    <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="63" class="def"/>
-    <base access="protected">
-      <type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
-    </base>
-    <base access="protected">
-      <type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
-    </base>
-    <doc>
-      <brief>
-        <text>A class that should inherit functions as protected.</text>
-      </brief>
-    </doc>
-    <function name="derived_shadowed" id="oVVGDloOS5F7d4VIcKLc0YpnsiE=">
-      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="69"/>
+    <function name="do_base_inherited" access="protected" id="TaKAQiDmx8UXkT9p/momqiOZyHU=">
+      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="46"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="KpfFXd3FeSffU3rGswegSIkkCrM=" name="protected_derived"/>
+          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should shadow the base class function.</text>
+          <text>This function should be inherited by derived classes.</text>
         </brief>
         <returns>
-          <text>A class that should inherit functions as protected.</text>
+          <text>A base class to test inheritance and shadowing</text>
         </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" id="4ZJznHda5QNdk/tsMca4Psswlj0=">
-      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="72"/>
+    <function name="do_base_shadowed" access="protected" id="eHxe3z0iWUXdcNyXK0PD2+6DRbs=">
+      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="44"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="KpfFXd3FeSffU3rGswegSIkkCrM=" name="protected_derived"/>
+          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should shadow the excluded_base function.</text>
+        </brief>
+        <returns>
+          <text>A base class to test inheritance and shadowing</text>
+        </returns>
+      </doc>
+    </function>
+    <function name="do_derived_shadowed" access="protected" id="NJYWKnKWmizdaSr1ldC7FGh7fD0=">
+      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="85"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="aiF6nWGZXbG8UfC75J5tNuoPMRc=" name="private_derived"/>
         </type>
       </return>
       <doc>
@@ -465,10 +512,50 @@
           <text>This function should shadow the base class function.</text>
         </brief>
         <returns>
-          <text>A class that should inherit functions as protected.</text>
+          <text>A class that uses private inheritance only</text>
         </returns>
       </doc>
     </function>
+    <function name="do_excluded_inherited" access="protected" id="bcAGvatJOmHfwquqeK/vawE7p6k=">
+      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="16"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be inherited by derived classes.</text>
+        </brief>
+      </doc>
+    </function>
+    <function name="do_shadowed" access="protected" id="fo/PP2HZqWRI2Sc4jY1ZzHUzKEI=">
+      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="12"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be shadowed by derived classes.</text>
+        </brief>
+      </doc>
+    </function>
+  </class>
+  <class name="protected_derived" id="KpfFXd3FeSffU3rGswegSIkkCrM=">
+    <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="63" class="def"/>
+    <base access="protected">
+      <type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+    </base>
+    <base access="protected">
+      <type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
+    </base>
+    <doc>
+      <brief>
+        <text>A class that should inherit functions as protected.</text>
+      </brief>
+    </doc>
     <function name="base_base_inherited" id="2D7yc6q3buDhuPwzpn4pWzbu8ls=">
       <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="23"/>
       <return>
@@ -517,23 +604,36 @@
         </returns>
       </doc>
     </function>
-    <function name="derived_shadowed" id="aYhSUMJkgCRo3AZmBb/rre04Ghg=">
-      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="35"/>
+    <function name="derived_shadowed" id="oVVGDloOS5F7d4VIcKLc0YpnsiE=">
+      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="69"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+          <pointee-type id="KpfFXd3FeSffU3rGswegSIkkCrM=" name="protected_derived"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should be shadowed by derived classes.</text>
+          <text>This function should shadow the base class function.</text>
         </brief>
         <returns>
-          <text>A base class to test inheritance and shadowing</text>
+          <text>A class that should inherit functions as protected.</text>
         </returns>
       </doc>
     </function>
-    <function name="do_base_base_inherited" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
+    <function name="excluded_inherited" id="H8wEIL8+8s3iNqadfPsH1HWRQU4=">
+      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="9"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be inherited by derived classes.</text>
+        </brief>
+      </doc>
+    </function>
+    <function name="do_base_base_inherited" access="protected" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
       <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="26"/>
       <return>
         <type class="lvalue-reference">
@@ -581,19 +681,19 @@
         </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" access="protected" id="KGOrnDVJV2nPDK1hlkvBm6diYXY=">
-      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="42"/>
+    <function name="do_derived_shadowed" access="protected" id="4ZJznHda5QNdk/tsMca4Psswlj0=">
+      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="72"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+          <pointee-type id="KpfFXd3FeSffU3rGswegSIkkCrM=" name="protected_derived"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should be shadowed by derived classes.</text>
+          <text>This function should shadow the base class function.</text>
         </brief>
         <returns>
-          <text>A base class to test inheritance and shadowing</text>
+          <text>A class that should inherit functions as protected.</text>
         </returns>
       </doc>
     </function>
@@ -623,19 +723,6 @@
         </brief>
       </doc>
     </function>
-    <function name="excluded_inherited" id="H8wEIL8+8s3iNqadfPsH1HWRQU4=">
-      <file short-path="copy-dependencies.cpp" source-path="copy-dependencies.cpp" line="9"/>
-      <return>
-        <type class="lvalue-reference">
-          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
-        </type>
-      </return>
-      <doc>
-        <brief>
-          <text>This function should be inherited by derived classes.</text>
-        </brief>
-      </doc>
-    </function>
   </class>
 </namespace>
 </mrdocs>
diff --git a/test-files/golden-tests/config/inherit-base-members/copy.adoc b/test-files/golden-tests/config/inherit-base-members/copy.adoc
index 3f9cabdfc..4f4baacdc 100644
--- a/test-files/golden-tests/config/inherit-base-members/copy.adoc
+++ b/test-files/golden-tests/config/inherit-base-members/copy.adoc
@@ -61,8 +61,6 @@ class base
 | This function should shadow the excluded&lowbar;base function&period;
 | link:#base-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should be shadowed by derived classes&period;
-| link:#base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
-| This function should be indirectly inherited by derived classes&period;
 |===
 
 === Protected Member Functions
@@ -71,6 +69,8 @@ class base
 |===
 | Name
 | Description
+| link:#base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
 | link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
@@ -263,6 +263,14 @@ class base&lowbar;base;
 | Description
 | link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
+|===
+
+=== Protected Member Functions
+
+[cols=2]
+|===
+| Name
+| Description
 | link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 |===
@@ -357,10 +365,6 @@ class derived
 | This function should shadow the excluded&lowbar;base function&period;
 | link:#derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
-| link:#derived-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
-| This function should be indirectly inherited by derived classes&period;
-| link:#derived-do_derived_shadowed-0a[`do&lowbar;derived&lowbar;shadowed`] 
-| This function should shadow the base class function&period;
 | link:#derived-excluded_inherited[`excluded&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 |===
@@ -371,12 +375,14 @@ class derived
 |===
 | Name
 | Description
+| link:#derived-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
 | link:#derived-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#derived-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
 | This function should shadow the excluded&lowbar;base function&period;
-| link:#derived-do_derived_shadowed-0d[`do&lowbar;derived&lowbar;shadowed`] 
-| This function should be shadowed by derived classes&period;
+| link:#derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
+| This function should shadow the base class function&period;
 | link:#derived-do_excluded_inherited[`do&lowbar;excluded&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#derived-do_shadowed[`do&lowbar;shadowed`] 
@@ -459,10 +465,10 @@ derived&lowbar;shadowed();
 
 A class that derives from base and excluded&lowbar;base
 
-[#derived-do_base_base_inherited]
-== link:#derived[derived]::do&lowbar;base&lowbar;base&lowbar;inherited
+[#derived-excluded_inherited]
+== link:#derived[derived]::excluded&lowbar;inherited
 
-This function should be indirectly inherited by derived classes&period;
+This function should be inherited by derived classes&period;
 
 === Synopsis
 
@@ -470,18 +476,14 @@ Declared in `&lt;copy&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-link:#base_base[base&lowbar;base]&
-do&lowbar;base&lowbar;base&lowbar;inherited();
+excluded&lowbar;base&
+excluded&lowbar;inherited();
 ----
 
-=== Return Value
-
-A second&hyphen;order base class to test indirect inheritance
-
-[#derived-do_derived_shadowed-0a]
-== link:#derived[derived]::do&lowbar;derived&lowbar;shadowed
+[#derived-do_base_base_inherited]
+== link:#derived[derived]::do&lowbar;base&lowbar;base&lowbar;inherited
 
-This function should shadow the base class function&period;
+This function should be indirectly inherited by derived classes&period;
 
 === Synopsis
 
@@ -489,28 +491,13 @@ Declared in `&lt;copy&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-link:#derived[derived]&
-do&lowbar;derived&lowbar;shadowed();
+link:#base_base[base&lowbar;base]&
+do&lowbar;base&lowbar;base&lowbar;inherited();
 ----
 
 === Return Value
 
-A class that derives from base and excluded&lowbar;base
-
-[#derived-excluded_inherited]
-== link:#derived[derived]::excluded&lowbar;inherited
-
-This function should be inherited by derived classes&period;
-
-=== Synopsis
-
-Declared in `&lt;copy&period;cpp&gt;`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-excluded&lowbar;base&
-excluded&lowbar;inherited();
-----
+A second&hyphen;order base class to test indirect inheritance
 
 [#derived-do_base_inherited]
 == link:#derived[derived]::do&lowbar;base&lowbar;inherited
@@ -550,10 +537,10 @@ do&lowbar;base&lowbar;shadowed();
 
 A base class to test inheritance and shadowing
 
-[#derived-do_derived_shadowed-0d]
+[#derived-do_derived_shadowed]
 == link:#derived[derived]::do&lowbar;derived&lowbar;shadowed
 
-This function should be shadowed by derived classes&period;
+This function should shadow the base class function&period;
 
 === Synopsis
 
@@ -561,13 +548,13 @@ Declared in `&lt;copy&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-link:#base[base]&
+link:#derived[derived]&
 do&lowbar;derived&lowbar;shadowed();
 ----
 
 === Return Value
 
-A base class to test inheritance and shadowing
+A class that derives from base and excluded&lowbar;base
 
 [#derived-do_excluded_inherited]
 == link:#derived[derived]::do&lowbar;excluded&lowbar;inherited
@@ -621,12 +608,95 @@ class private&lowbar;derived
 |===
 | Name
 | Description
+| link:#private_derived-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
+| link:#private_derived-base_inherited[`base&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+| link:#private_derived-base_shadowed[`base&lowbar;shadowed`] 
+| This function should shadow the excluded&lowbar;base function&period;
 | link:#private_derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
+| link:#private_derived-excluded_inherited[`excluded&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+|===
+
+=== Protected Member Functions
+
+[cols=2]
+|===
+| Name
+| Description
+| link:#private_derived-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
+| link:#private_derived-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+| link:#private_derived-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
+| This function should shadow the excluded&lowbar;base function&period;
 | link:#private_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
+| link:#private_derived-do_excluded_inherited[`do&lowbar;excluded&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+| link:#private_derived-do_shadowed[`do&lowbar;shadowed`] 
+| This function should be shadowed by derived classes&period;
 |===
 
+[#private_derived-base_base_inherited]
+== link:#private_derived[private&lowbar;derived]::base&lowbar;base&lowbar;inherited
+
+This function should be indirectly inherited by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;copy&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+link:#base_base[base&lowbar;base]&
+base&lowbar;base&lowbar;inherited();
+----
+
+=== Return Value
+
+A second&hyphen;order base class to test indirect inheritance
+
+[#private_derived-base_inherited]
+== link:#private_derived[private&lowbar;derived]::base&lowbar;inherited
+
+This function should be inherited by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;copy&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+link:#base[base]&
+base&lowbar;inherited();
+----
+
+=== Return Value
+
+A base class to test inheritance and shadowing
+
+[#private_derived-base_shadowed]
+== link:#private_derived[private&lowbar;derived]::base&lowbar;shadowed
+
+This function should shadow the excluded&lowbar;base function&period;
+
+=== Synopsis
+
+Declared in `&lt;copy&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+link:#base[base]&
+base&lowbar;shadowed();
+----
+
+=== Return Value
+
+A base class to test inheritance and shadowing
+
 [#private_derived-derived_shadowed]
 == link:#private_derived[private&lowbar;derived]::derived&lowbar;shadowed
 
@@ -646,6 +716,78 @@ derived&lowbar;shadowed();
 
 A class that uses private inheritance only
 
+[#private_derived-excluded_inherited]
+== link:#private_derived[private&lowbar;derived]::excluded&lowbar;inherited
+
+This function should be inherited by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;copy&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+excluded&lowbar;base&
+excluded&lowbar;inherited();
+----
+
+[#private_derived-do_base_base_inherited]
+== link:#private_derived[private&lowbar;derived]::do&lowbar;base&lowbar;base&lowbar;inherited
+
+This function should be indirectly inherited by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;copy&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+link:#base_base[base&lowbar;base]&
+do&lowbar;base&lowbar;base&lowbar;inherited();
+----
+
+=== Return Value
+
+A second&hyphen;order base class to test indirect inheritance
+
+[#private_derived-do_base_inherited]
+== link:#private_derived[private&lowbar;derived]::do&lowbar;base&lowbar;inherited
+
+This function should be inherited by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;copy&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+link:#base[base]&
+do&lowbar;base&lowbar;inherited();
+----
+
+=== Return Value
+
+A base class to test inheritance and shadowing
+
+[#private_derived-do_base_shadowed]
+== link:#private_derived[private&lowbar;derived]::do&lowbar;base&lowbar;shadowed
+
+This function should shadow the excluded&lowbar;base function&period;
+
+=== Synopsis
+
+Declared in `&lt;copy&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+link:#base[base]&
+do&lowbar;base&lowbar;shadowed();
+----
+
+=== Return Value
+
+A base class to test inheritance and shadowing
+
 [#private_derived-do_derived_shadowed]
 == link:#private_derived[private&lowbar;derived]::do&lowbar;derived&lowbar;shadowed
 
@@ -665,6 +807,36 @@ do&lowbar;derived&lowbar;shadowed();
 
 A class that uses private inheritance only
 
+[#private_derived-do_excluded_inherited]
+== link:#private_derived[private&lowbar;derived]::do&lowbar;excluded&lowbar;inherited
+
+This function should be inherited by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;copy&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+excluded&lowbar;base&
+do&lowbar;excluded&lowbar;inherited();
+----
+
+[#private_derived-do_shadowed]
+== link:#private_derived[private&lowbar;derived]::do&lowbar;shadowed
+
+This function should be shadowed by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;copy&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+excluded&lowbar;base&
+do&lowbar;shadowed();
+----
+
 [#protected_derived]
 == protected&lowbar;derived
 
@@ -699,10 +871,16 @@ class protected&lowbar;derived
 |===
 | Name
 | Description
-| link:#protected_derived-derived_shadowed-0a[`derived&lowbar;shadowed`] 
-| This function should shadow the base class function&period;
-| link:#protected_derived-do_derived_shadowed-0e[`do&lowbar;derived&lowbar;shadowed`] 
+| link:#protected_derived-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
+| link:#protected_derived-base_inherited[`base&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+| link:#protected_derived-base_shadowed[`base&lowbar;shadowed`] 
+| This function should shadow the excluded&lowbar;base function&period;
+| link:#protected_derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
+| link:#protected_derived-excluded_inherited[`excluded&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
 |===
 
 === Protected Member Functions
@@ -711,68 +889,20 @@ class protected&lowbar;derived
 |===
 | Name
 | Description
-| link:#protected_derived-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
-| This function should be indirectly inherited by derived classes&period;
-| link:#protected_derived-base_inherited[`base&lowbar;inherited`] 
-| This function should be inherited by derived classes&period;
-| link:#protected_derived-base_shadowed[`base&lowbar;shadowed`] 
-| This function should shadow the excluded&lowbar;base function&period;
-| link:#protected_derived-derived_shadowed-0f[`derived&lowbar;shadowed`] 
-| This function should be shadowed by derived classes&period;
 | link:#protected_derived-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 | link:#protected_derived-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#protected_derived-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
 | This function should shadow the excluded&lowbar;base function&period;
-| link:#protected_derived-do_derived_shadowed-06[`do&lowbar;derived&lowbar;shadowed`] 
-| This function should be shadowed by derived classes&period;
+| link:#protected_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
+| This function should shadow the base class function&period;
 | link:#protected_derived-do_excluded_inherited[`do&lowbar;excluded&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#protected_derived-do_shadowed[`do&lowbar;shadowed`] 
 | This function should be shadowed by derived classes&period;
-| link:#protected_derived-excluded_inherited[`excluded&lowbar;inherited`] 
-| This function should be inherited by derived classes&period;
 |===
 
-[#protected_derived-derived_shadowed-0a]
-== link:#protected_derived[protected&lowbar;derived]::derived&lowbar;shadowed
-
-This function should shadow the base class function&period;
-
-=== Synopsis
-
-Declared in `&lt;copy&period;cpp&gt;`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-link:#protected_derived[protected&lowbar;derived]&
-derived&lowbar;shadowed();
-----
-
-=== Return Value
-
-A class that should inherit functions as protected&period;
-
-[#protected_derived-do_derived_shadowed-0e]
-== link:#protected_derived[protected&lowbar;derived]::do&lowbar;derived&lowbar;shadowed
-
-This function should shadow the base class function&period;
-
-=== Synopsis
-
-Declared in `&lt;copy&period;cpp&gt;`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-link:#protected_derived[protected&lowbar;derived]&
-do&lowbar;derived&lowbar;shadowed();
-----
-
-=== Return Value
-
-A class that should inherit functions as protected&period;
-
 [#protected_derived-base_base_inherited]
 == link:#protected_derived[protected&lowbar;derived]::base&lowbar;base&lowbar;inherited
 
@@ -830,10 +960,10 @@ base&lowbar;shadowed();
 
 A base class to test inheritance and shadowing
 
-[#protected_derived-derived_shadowed-0f]
+[#protected_derived-derived_shadowed]
 == link:#protected_derived[protected&lowbar;derived]::derived&lowbar;shadowed
 
-This function should be shadowed by derived classes&period;
+This function should shadow the base class function&period;
 
 === Synopsis
 
@@ -841,13 +971,28 @@ Declared in `&lt;copy&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-link:#base[base]&
+link:#protected_derived[protected&lowbar;derived]&
 derived&lowbar;shadowed();
 ----
 
 === Return Value
 
-A base class to test inheritance and shadowing
+A class that should inherit functions as protected&period;
+
+[#protected_derived-excluded_inherited]
+== link:#protected_derived[protected&lowbar;derived]::excluded&lowbar;inherited
+
+This function should be inherited by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;copy&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+excluded&lowbar;base&
+excluded&lowbar;inherited();
+----
 
 [#protected_derived-do_base_base_inherited]
 == link:#protected_derived[protected&lowbar;derived]::do&lowbar;base&lowbar;base&lowbar;inherited
@@ -906,10 +1051,10 @@ do&lowbar;base&lowbar;shadowed();
 
 A base class to test inheritance and shadowing
 
-[#protected_derived-do_derived_shadowed-06]
+[#protected_derived-do_derived_shadowed]
 == link:#protected_derived[protected&lowbar;derived]::do&lowbar;derived&lowbar;shadowed
 
-This function should be shadowed by derived classes&period;
+This function should shadow the base class function&period;
 
 === Synopsis
 
@@ -917,13 +1062,13 @@ Declared in `&lt;copy&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-link:#base[base]&
+link:#protected_derived[protected&lowbar;derived]&
 do&lowbar;derived&lowbar;shadowed();
 ----
 
 === Return Value
 
-A base class to test inheritance and shadowing
+A class that should inherit functions as protected&period;
 
 [#protected_derived-do_excluded_inherited]
 == link:#protected_derived[protected&lowbar;derived]::do&lowbar;excluded&lowbar;inherited
@@ -955,20 +1100,5 @@ excluded&lowbar;base&
 do&lowbar;shadowed();
 ----
 
-[#protected_derived-excluded_inherited]
-== link:#protected_derived[protected&lowbar;derived]::excluded&lowbar;inherited
-
-This function should be inherited by derived classes&period;
-
-=== Synopsis
-
-Declared in `&lt;copy&period;cpp&gt;`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-excluded&lowbar;base&
-excluded&lowbar;inherited();
-----
-
 
 [.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/config/inherit-base-members/copy.cpp b/test-files/golden-tests/config/inherit-base-members/copy.cpp
index eff6deaf5..0a5efa42c 100644
--- a/test-files/golden-tests/config/inherit-base-members/copy.cpp
+++ b/test-files/golden-tests/config/inherit-base-members/copy.cpp
@@ -21,7 +21,7 @@ class base_base {
 public:
     /// This function should be indirectly inherited by derived classes.
     base_base& base_base_inherited();
-public:
+protected:
     /// This function should be indirectly inherited by derived classes.
     base_base& do_base_base_inherited();
 };
@@ -54,7 +54,7 @@ class derived
 public:
     /// This function should shadow the base class function.
     derived& derived_shadowed();
-public:
+protected:
     /// This function should shadow the base class function.
     derived& do_derived_shadowed();
 };
@@ -67,7 +67,7 @@ class protected_derived
 public:
     /// This function should shadow the base class function.
     protected_derived& derived_shadowed();
-public:
+protected:
     /// This function should shadow the base class function.
     protected_derived& do_derived_shadowed();
 };
@@ -80,7 +80,7 @@ class private_derived
 public:
     /// This function should shadow the base class function.
     private_derived& derived_shadowed();
-public:
+protected:
     /// This function should shadow the base class function.
     private_derived& do_derived_shadowed();
 };
diff --git a/test-files/golden-tests/config/inherit-base-members/copy.html b/test-files/golden-tests/config/inherit-base-members/copy.html
index 781fd9edf..5550bfaa0 100644
--- a/test-files/golden-tests/config/inherit-base-members/copy.html
+++ b/test-files/golden-tests/config/inherit-base-members/copy.html
@@ -74,8 +74,7 @@ <h2>Member Functions</h2>
 <td><a href="#base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#base-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
-<td><a href="#base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
+<td><a href="#base-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
 </tbody>
 </table>
 
@@ -90,6 +89,7 @@ <h2>Protected Member Functions</h2>
 </thead>
 <tbody>
 <tr>
+<td><a href="#base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
 <td><a href="#base-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
@@ -333,12 +333,25 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
-<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
+<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
 </tbody>
 </table>
 
 
+<h2>Protected Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
+</tbody>
+</table>
+
 
 <div>
 <h2>Derived Classes</h2>
@@ -453,8 +466,6 @@ <h2>Member Functions</h2>
 <td><a href="#derived-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#derived-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
 <td><a href="#derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
-<td><a href="#derived-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
-<td><a href="#derived-do_derived_shadowed-0a"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
 <td><a href="#derived-excluded_inherited"><code>excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr>
 </tbody>
 </table>
@@ -470,9 +481,10 @@ <h2>Protected Member Functions</h2>
 </thead>
 <tbody>
 <tr>
+<td><a href="#derived-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#derived-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#derived-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#derived-do_derived_shadowed-0d"><code>do_derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
+<td><a href="#derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
 <td><a href="#derived-do_excluded_inherited"><code>do_excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#derived-do_shadowed"><code>do_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
 </tbody>
@@ -578,9 +590,9 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_base_base_inherited"><a href="#derived-do_base_base_inherited">derived::do_base_base_inherited</a></h2>
+<h2 id="derived-excluded_inherited"><a href="#derived-excluded_inherited">derived::excluded_inherited</a></h2>
 <div>
-<span>This function should be indirectly inherited by derived classes.</span>
+<span>This function should be inherited by derived classes.</span>
 
 </div>
 </div>
@@ -589,22 +601,18 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;copy.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp"><a href="#base_base">base_base</a>&
-do_base_base_inherited();
+<code class="source-code cpp">excluded_base&
+excluded_inherited();
 
 </code>
 </pre>
 </div>
-<div>
-<h3>Return Value</h3>
-<span>A second-order base class to test indirect inheritance</span>
-</div>
 </div>
 <div>
 <div>
-<h2 id="derived-do_derived_shadowed-0a"><a href="#derived-do_derived_shadowed-0a">derived::do_derived_shadowed</a></h2>
+<h2 id="derived-do_base_base_inherited"><a href="#derived-do_base_base_inherited">derived::do_base_base_inherited</a></h2>
 <div>
-<span>This function should shadow the base class function.</span>
+<span>This function should be indirectly inherited by derived classes.</span>
 
 </div>
 </div>
@@ -613,35 +621,15 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;copy.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp"><a href="#derived">derived</a>&
-do_derived_shadowed();
+<code class="source-code cpp"><a href="#base_base">base_base</a>&
+do_base_base_inherited();
 
 </code>
 </pre>
 </div>
 <div>
 <h3>Return Value</h3>
-<span>A class that derives from base and excluded_base</span>
-</div>
-</div>
-<div>
-<div>
-<h2 id="derived-excluded_inherited"><a href="#derived-excluded_inherited">derived::excluded_inherited</a></h2>
-<div>
-<span>This function should be inherited by derived classes.</span>
-
-</div>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;copy.cpp&gt;</code></div>
-<pre>
-<code class="source-code cpp">excluded_base&
-excluded_inherited();
-
-</code>
-</pre>
+<span>A second-order base class to test indirect inheritance</span>
 </div>
 </div>
 <div>
@@ -694,9 +682,9 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_derived_shadowed-0d"><a href="#derived-do_derived_shadowed-0d">derived::do_derived_shadowed</a></h2>
+<h2 id="derived-do_derived_shadowed"><a href="#derived-do_derived_shadowed">derived::do_derived_shadowed</a></h2>
 <div>
-<span>This function should be shadowed by derived classes.</span>
+<span>This function should shadow the base class function.</span>
 
 </div>
 </div>
@@ -705,7 +693,7 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;copy.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp"><a href="#base">base</a>&
+<code class="source-code cpp"><a href="#derived">derived</a>&
 do_derived_shadowed();
 
 </code>
@@ -713,7 +701,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Return Value</h3>
-<span>A base class to test inheritance and shadowing</span>
+<span>A class that derives from base and excluded_base</span>
 </div>
 </div>
 <div>
@@ -786,13 +774,107 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
+<td><a href="#private_derived-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
+<td><a href="#private_derived-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
+<td><a href="#private_derived-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
 <td><a href="#private_derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
-<td><a href="#private_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
+<td><a href="#private_derived-excluded_inherited"><code>excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr>
 </tbody>
 </table>
 
 
+<h2>Protected Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#private_derived-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
+<td><a href="#private_derived-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
+<td><a href="#private_derived-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
+<td><a href="#private_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
+<td><a href="#private_derived-do_excluded_inherited"><code>do_excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
+<td><a href="#private_derived-do_shadowed"><code>do_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
+</tbody>
+</table>
+
 
+</div>
+<div>
+<div>
+<h2 id="private_derived-base_base_inherited"><a href="#private_derived-base_base_inherited">private_derived::base_base_inherited</a></h2>
+<div>
+<span>This function should be indirectly inherited by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;copy.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp"><a href="#base_base">base_base</a>&
+base_base_inherited();
+
+</code>
+</pre>
+</div>
+<div>
+<h3>Return Value</h3>
+<span>A second-order base class to test indirect inheritance</span>
+</div>
+</div>
+<div>
+<div>
+<h2 id="private_derived-base_inherited"><a href="#private_derived-base_inherited">private_derived::base_inherited</a></h2>
+<div>
+<span>This function should be inherited by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;copy.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp"><a href="#base">base</a>&
+base_inherited();
+
+</code>
+</pre>
+</div>
+<div>
+<h3>Return Value</h3>
+<span>A base class to test inheritance and shadowing</span>
+</div>
+</div>
+<div>
+<div>
+<h2 id="private_derived-base_shadowed"><a href="#private_derived-base_shadowed">private_derived::base_shadowed</a></h2>
+<div>
+<span>This function should shadow the excluded_base function.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;copy.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp"><a href="#base">base</a>&
+base_shadowed();
+
+</code>
+</pre>
+</div>
+<div>
+<h3>Return Value</h3>
+<span>A base class to test inheritance and shadowing</span>
+</div>
 </div>
 <div>
 <div>
@@ -820,6 +902,98 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
+<h2 id="private_derived-excluded_inherited"><a href="#private_derived-excluded_inherited">private_derived::excluded_inherited</a></h2>
+<div>
+<span>This function should be inherited by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;copy.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">excluded_base&
+excluded_inherited();
+
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
+<h2 id="private_derived-do_base_base_inherited"><a href="#private_derived-do_base_base_inherited">private_derived::do_base_base_inherited</a></h2>
+<div>
+<span>This function should be indirectly inherited by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;copy.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp"><a href="#base_base">base_base</a>&
+do_base_base_inherited();
+
+</code>
+</pre>
+</div>
+<div>
+<h3>Return Value</h3>
+<span>A second-order base class to test indirect inheritance</span>
+</div>
+</div>
+<div>
+<div>
+<h2 id="private_derived-do_base_inherited"><a href="#private_derived-do_base_inherited">private_derived::do_base_inherited</a></h2>
+<div>
+<span>This function should be inherited by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;copy.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp"><a href="#base">base</a>&
+do_base_inherited();
+
+</code>
+</pre>
+</div>
+<div>
+<h3>Return Value</h3>
+<span>A base class to test inheritance and shadowing</span>
+</div>
+</div>
+<div>
+<div>
+<h2 id="private_derived-do_base_shadowed"><a href="#private_derived-do_base_shadowed">private_derived::do_base_shadowed</a></h2>
+<div>
+<span>This function should shadow the excluded_base function.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;copy.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp"><a href="#base">base</a>&
+do_base_shadowed();
+
+</code>
+</pre>
+</div>
+<div>
+<h3>Return Value</h3>
+<span>A base class to test inheritance and shadowing</span>
+</div>
+</div>
+<div>
+<div>
 <h2 id="private_derived-do_derived_shadowed"><a href="#private_derived-do_derived_shadowed">private_derived::do_derived_shadowed</a></h2>
 <div>
 <span>This function should shadow the base class function.</span>
@@ -844,6 +1018,46 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
+<h2 id="private_derived-do_excluded_inherited"><a href="#private_derived-do_excluded_inherited">private_derived::do_excluded_inherited</a></h2>
+<div>
+<span>This function should be inherited by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;copy.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">excluded_base&
+do_excluded_inherited();
+
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
+<h2 id="private_derived-do_shadowed"><a href="#private_derived-do_shadowed">private_derived::do_shadowed</a></h2>
+<div>
+<span>This function should be shadowed by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;copy.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">excluded_base&
+do_shadowed();
+
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
 <h2 id="protected_derived"><a href="#protected_derived">protected_derived</a></h2>
 <div>
 <span>A class that should inherit functions as protected.</span>
@@ -887,8 +1101,11 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#protected_derived-derived_shadowed-0a"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
-<td><a href="#protected_derived-do_derived_shadowed-0e"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
+<td><a href="#protected_derived-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
+<td><a href="#protected_derived-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
+<td><a href="#protected_derived-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
+<td><a href="#protected_derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
+<td><a href="#protected_derived-excluded_inherited"><code>excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr>
 </tbody>
 </table>
 
@@ -903,17 +1120,12 @@ <h2>Protected Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#protected_derived-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
-<td><a href="#protected_derived-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
-<td><a href="#protected_derived-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#protected_derived-derived_shadowed-0f"><code>derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
 <td><a href="#protected_derived-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#protected_derived-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#protected_derived-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#protected_derived-do_derived_shadowed-06"><code>do_derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
+<td><a href="#protected_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
 <td><a href="#protected_derived-do_excluded_inherited"><code>do_excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
-<td><a href="#protected_derived-do_shadowed"><code>do_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
-<td><a href="#protected_derived-excluded_inherited"><code>excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr>
+<td><a href="#protected_derived-do_shadowed"><code>do_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
 </tbody>
 </table>
 
@@ -921,33 +1133,9 @@ <h2>Protected Member Functions</h2>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-derived_shadowed-0a"><a href="#protected_derived-derived_shadowed-0a">protected_derived::derived_shadowed</a></h2>
-<div>
-<span>This function should shadow the base class function.</span>
-
-</div>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;copy.cpp&gt;</code></div>
-<pre>
-<code class="source-code cpp"><a href="#protected_derived">protected_derived</a>&
-derived_shadowed();
-
-</code>
-</pre>
-</div>
-<div>
-<h3>Return Value</h3>
-<span>A class that should inherit functions as protected.</span>
-</div>
-</div>
-<div>
-<div>
-<h2 id="protected_derived-do_derived_shadowed-0e"><a href="#protected_derived-do_derived_shadowed-0e">protected_derived::do_derived_shadowed</a></h2>
+<h2 id="protected_derived-base_base_inherited"><a href="#protected_derived-base_base_inherited">protected_derived::base_base_inherited</a></h2>
 <div>
-<span>This function should shadow the base class function.</span>
+<span>This function should be indirectly inherited by derived classes.</span>
 
 </div>
 </div>
@@ -956,22 +1144,22 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;copy.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp"><a href="#protected_derived">protected_derived</a>&
-do_derived_shadowed();
+<code class="source-code cpp"><a href="#base_base">base_base</a>&
+base_base_inherited();
 
 </code>
 </pre>
 </div>
 <div>
 <h3>Return Value</h3>
-<span>A class that should inherit functions as protected.</span>
+<span>A second-order base class to test indirect inheritance</span>
 </div>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-base_base_inherited"><a href="#protected_derived-base_base_inherited">protected_derived::base_base_inherited</a></h2>
+<h2 id="protected_derived-base_inherited"><a href="#protected_derived-base_inherited">protected_derived::base_inherited</a></h2>
 <div>
-<span>This function should be indirectly inherited by derived classes.</span>
+<span>This function should be inherited by derived classes.</span>
 
 </div>
 </div>
@@ -980,22 +1168,22 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;copy.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp"><a href="#base_base">base_base</a>&
-base_base_inherited();
+<code class="source-code cpp"><a href="#base">base</a>&
+base_inherited();
 
 </code>
 </pre>
 </div>
 <div>
 <h3>Return Value</h3>
-<span>A second-order base class to test indirect inheritance</span>
+<span>A base class to test inheritance and shadowing</span>
 </div>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-base_inherited"><a href="#protected_derived-base_inherited">protected_derived::base_inherited</a></h2>
+<h2 id="protected_derived-base_shadowed"><a href="#protected_derived-base_shadowed">protected_derived::base_shadowed</a></h2>
 <div>
-<span>This function should be inherited by derived classes.</span>
+<span>This function should shadow the excluded_base function.</span>
 
 </div>
 </div>
@@ -1005,7 +1193,7 @@ <h3>Synopsis</h3>
 Declared in <code>&lt;copy.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp"><a href="#base">base</a>&
-base_inherited();
+base_shadowed();
 
 </code>
 </pre>
@@ -1017,9 +1205,9 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-base_shadowed"><a href="#protected_derived-base_shadowed">protected_derived::base_shadowed</a></h2>
+<h2 id="protected_derived-derived_shadowed"><a href="#protected_derived-derived_shadowed">protected_derived::derived_shadowed</a></h2>
 <div>
-<span>This function should shadow the excluded_base function.</span>
+<span>This function should shadow the base class function.</span>
 
 </div>
 </div>
@@ -1028,22 +1216,22 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;copy.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp"><a href="#base">base</a>&
-base_shadowed();
+<code class="source-code cpp"><a href="#protected_derived">protected_derived</a>&
+derived_shadowed();
 
 </code>
 </pre>
 </div>
 <div>
 <h3>Return Value</h3>
-<span>A base class to test inheritance and shadowing</span>
+<span>A class that should inherit functions as protected.</span>
 </div>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-derived_shadowed-0f"><a href="#protected_derived-derived_shadowed-0f">protected_derived::derived_shadowed</a></h2>
+<h2 id="protected_derived-excluded_inherited"><a href="#protected_derived-excluded_inherited">protected_derived::excluded_inherited</a></h2>
 <div>
-<span>This function should be shadowed by derived classes.</span>
+<span>This function should be inherited by derived classes.</span>
 
 </div>
 </div>
@@ -1052,16 +1240,12 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;copy.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp"><a href="#base">base</a>&
-derived_shadowed();
+<code class="source-code cpp">excluded_base&
+excluded_inherited();
 
 </code>
 </pre>
 </div>
-<div>
-<h3>Return Value</h3>
-<span>A base class to test inheritance and shadowing</span>
-</div>
 </div>
 <div>
 <div>
@@ -1137,9 +1321,9 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_derived_shadowed-06"><a href="#protected_derived-do_derived_shadowed-06">protected_derived::do_derived_shadowed</a></h2>
+<h2 id="protected_derived-do_derived_shadowed"><a href="#protected_derived-do_derived_shadowed">protected_derived::do_derived_shadowed</a></h2>
 <div>
-<span>This function should be shadowed by derived classes.</span>
+<span>This function should shadow the base class function.</span>
 
 </div>
 </div>
@@ -1148,7 +1332,7 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;copy.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp"><a href="#base">base</a>&
+<code class="source-code cpp"><a href="#protected_derived">protected_derived</a>&
 do_derived_shadowed();
 
 </code>
@@ -1156,7 +1340,7 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <h3>Return Value</h3>
-<span>A base class to test inheritance and shadowing</span>
+<span>A class that should inherit functions as protected.</span>
 </div>
 </div>
 <div>
@@ -1195,26 +1379,6 @@ <h3>Synopsis</h3>
 <code class="source-code cpp">excluded_base&
 do_shadowed();
 
-</code>
-</pre>
-</div>
-</div>
-<div>
-<div>
-<h2 id="protected_derived-excluded_inherited"><a href="#protected_derived-excluded_inherited">protected_derived::excluded_inherited</a></h2>
-<div>
-<span>This function should be inherited by derived classes.</span>
-
-</div>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;copy.cpp&gt;</code></div>
-<pre>
-<code class="source-code cpp">excluded_base&
-excluded_inherited();
-
 </code>
 </pre>
 </div>
diff --git a/test-files/golden-tests/config/inherit-base-members/copy.xml b/test-files/golden-tests/config/inherit-base-members/copy.xml
index e2a9fdb77..ca309c2a0 100644
--- a/test-files/golden-tests/config/inherit-base-members/copy.xml
+++ b/test-files/golden-tests/config/inherit-base-members/copy.xml
@@ -76,7 +76,7 @@
         </returns>
       </doc>
     </function>
-    <function name="do_base_base_inherited" id="QFvlG37sjpI5QZrNwpdQ06VrrSM=">
+    <function name="do_base_base_inherited" access="protected" id="QFvlG37sjpI5QZrNwpdQ06VrrSM=">
       <file short-path="copy.cpp" source-path="copy.cpp" line="26"/>
       <return>
         <type class="lvalue-reference">
@@ -164,7 +164,7 @@
         </returns>
       </doc>
     </function>
-    <function name="do_base_base_inherited" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
+    <function name="do_base_base_inherited" access="protected" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
       <file short-path="copy.cpp" source-path="copy.cpp" line="26"/>
       <return>
         <type class="lvalue-reference">
@@ -258,51 +258,35 @@
         </returns>
       </doc>
     </function>
-    <function name="do_base_base_inherited" id="3vFJsBKleDdECAQKJp6m7566RQQ=">
-      <file short-path="copy.cpp" source-path="copy.cpp" line="26"/>
+    <function name="excluded_inherited" id="P1Eq799RJkNMSTci+0jy+ZejsyU=">
+      <file short-path="copy.cpp" source-path="copy.cpp" line="9"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=" name="base_base"/>
+          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should be indirectly inherited by derived classes.</text>
+          <text>This function should be inherited by derived classes.</text>
         </brief>
-        <returns>
-          <text>A second-order base class to test indirect inheritance</text>
-        </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" id="rTSnS8Pv8GoWusQQE42y0pgN4cw=">
-      <file short-path="copy.cpp" source-path="copy.cpp" line="59"/>
+    <function name="do_base_base_inherited" access="protected" id="3vFJsBKleDdECAQKJp6m7566RQQ=">
+      <file short-path="copy.cpp" source-path="copy.cpp" line="26"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="ABxWcxit2TyVLv16ZxoJKAc6LKw=" name="derived"/>
+          <pointee-type id="/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=" name="base_base"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should shadow the base class function.</text>
+          <text>This function should be indirectly inherited by derived classes.</text>
         </brief>
         <returns>
-          <text>A class that derives from base and excluded_base</text>
+          <text>A second-order base class to test indirect inheritance</text>
         </returns>
       </doc>
     </function>
-    <function name="excluded_inherited" id="P1Eq799RJkNMSTci+0jy+ZejsyU=">
-      <file short-path="copy.cpp" source-path="copy.cpp" line="9"/>
-      <return>
-        <type class="lvalue-reference">
-          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
-        </type>
-      </return>
-      <doc>
-        <brief>
-          <text>This function should be inherited by derived classes.</text>
-        </brief>
-      </doc>
-    </function>
     <function name="do_base_inherited" access="protected" id="J8r4aXb9++EldZDgHmv2rU2GhW0=">
       <file short-path="copy.cpp" source-path="copy.cpp" line="46"/>
       <return>
@@ -335,19 +319,19 @@
         </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" access="protected" id="1BMmFoheKBz9kYkFKzXHyfWZMQg=">
-      <file short-path="copy.cpp" source-path="copy.cpp" line="42"/>
+    <function name="do_derived_shadowed" access="protected" id="rTSnS8Pv8GoWusQQE42y0pgN4cw=">
+      <file short-path="copy.cpp" source-path="copy.cpp" line="59"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+          <pointee-type id="ABxWcxit2TyVLv16ZxoJKAc6LKw=" name="derived"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should be shadowed by derived classes.</text>
+          <text>This function should shadow the base class function.</text>
         </brief>
         <returns>
-          <text>A base class to test inheritance and shadowing</text>
+          <text>A class that derives from base and excluded_base</text>
         </returns>
       </doc>
     </function>
@@ -391,6 +375,54 @@
         <text>A class that uses private inheritance only</text>
       </brief>
     </doc>
+    <function name="base_base_inherited" id="UfHlDs+Jjm7ydZd6MxwawqVca5I=">
+      <file short-path="copy.cpp" source-path="copy.cpp" line="23"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=" name="base_base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be indirectly inherited by derived classes.</text>
+        </brief>
+        <returns>
+          <text>A second-order base class to test indirect inheritance</text>
+        </returns>
+      </doc>
+    </function>
+    <function name="base_inherited" id="47uB8QOPSbQkztWt67JcNr7M448=">
+      <file short-path="copy.cpp" source-path="copy.cpp" line="39"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be inherited by derived classes.</text>
+        </brief>
+        <returns>
+          <text>A base class to test inheritance and shadowing</text>
+        </returns>
+      </doc>
+    </function>
+    <function name="base_shadowed" id="cfFLZaP2zPxEBo+WMhgTd7YHpE8=">
+      <file short-path="copy.cpp" source-path="copy.cpp" line="37"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should shadow the excluded_base function.</text>
+        </brief>
+        <returns>
+          <text>A base class to test inheritance and shadowing</text>
+        </returns>
+      </doc>
+    </function>
     <function name="derived_shadowed" id="9wqRoOH7cwNhkz5vwpTHLeb01BY=">
       <file short-path="copy.cpp" source-path="copy.cpp" line="82"/>
       <return>
@@ -407,57 +439,72 @@
         </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" id="NJYWKnKWmizdaSr1ldC7FGh7fD0=">
-      <file short-path="copy.cpp" source-path="copy.cpp" line="85"/>
+    <function name="excluded_inherited" id="GZtztJDtmlpSfr66pbZ66w0XBRY=">
+      <file short-path="copy.cpp" source-path="copy.cpp" line="9"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="aiF6nWGZXbG8UfC75J5tNuoPMRc=" name="private_derived"/>
+          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should shadow the base class function.</text>
+          <text>This function should be inherited by derived classes.</text>
+        </brief>
+      </doc>
+    </function>
+    <function name="do_base_base_inherited" access="protected" id="mXjPOUUOmKMAaJ61Q94tPWTiKmI=">
+      <file short-path="copy.cpp" source-path="copy.cpp" line="26"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=" name="base_base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be indirectly inherited by derived classes.</text>
         </brief>
         <returns>
-          <text>A class that uses private inheritance only</text>
+          <text>A second-order base class to test indirect inheritance</text>
         </returns>
       </doc>
     </function>
-  </class>
-  <class name="protected_derived" id="KpfFXd3FeSffU3rGswegSIkkCrM=">
-    <file short-path="copy.cpp" source-path="copy.cpp" line="63" class="def"/>
-    <base access="protected">
-      <type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
-    </base>
-    <base access="protected">
-      <type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
-    </base>
-    <doc>
-      <brief>
-        <text>A class that should inherit functions as protected.</text>
-      </brief>
-    </doc>
-    <function name="derived_shadowed" id="oVVGDloOS5F7d4VIcKLc0YpnsiE=">
-      <file short-path="copy.cpp" source-path="copy.cpp" line="69"/>
+    <function name="do_base_inherited" access="protected" id="PXTubXThEBr9rbhcC8KDsPSRnds=">
+      <file short-path="copy.cpp" source-path="copy.cpp" line="46"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="KpfFXd3FeSffU3rGswegSIkkCrM=" name="protected_derived"/>
+          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should shadow the base class function.</text>
+          <text>This function should be inherited by derived classes.</text>
         </brief>
         <returns>
-          <text>A class that should inherit functions as protected.</text>
+          <text>A base class to test inheritance and shadowing</text>
         </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" id="4ZJznHda5QNdk/tsMca4Psswlj0=">
-      <file short-path="copy.cpp" source-path="copy.cpp" line="72"/>
+    <function name="do_base_shadowed" access="protected" id="trFoJ/aHlsNNS4+2sX1N/+xVY9Q=">
+      <file short-path="copy.cpp" source-path="copy.cpp" line="44"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="KpfFXd3FeSffU3rGswegSIkkCrM=" name="protected_derived"/>
+          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should shadow the excluded_base function.</text>
+        </brief>
+        <returns>
+          <text>A base class to test inheritance and shadowing</text>
+        </returns>
+      </doc>
+    </function>
+    <function name="do_derived_shadowed" access="protected" id="NJYWKnKWmizdaSr1ldC7FGh7fD0=">
+      <file short-path="copy.cpp" source-path="copy.cpp" line="85"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="aiF6nWGZXbG8UfC75J5tNuoPMRc=" name="private_derived"/>
         </type>
       </return>
       <doc>
@@ -465,10 +512,50 @@
           <text>This function should shadow the base class function.</text>
         </brief>
         <returns>
-          <text>A class that should inherit functions as protected.</text>
+          <text>A class that uses private inheritance only</text>
         </returns>
       </doc>
     </function>
+    <function name="do_excluded_inherited" access="protected" id="bcAGvatJOmHfwquqeK/vawE7p6k=">
+      <file short-path="copy.cpp" source-path="copy.cpp" line="16"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be inherited by derived classes.</text>
+        </brief>
+      </doc>
+    </function>
+    <function name="do_shadowed" access="protected" id="fo/PP2HZqWRI2Sc4jY1ZzHUzKEI=">
+      <file short-path="copy.cpp" source-path="copy.cpp" line="12"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be shadowed by derived classes.</text>
+        </brief>
+      </doc>
+    </function>
+  </class>
+  <class name="protected_derived" id="KpfFXd3FeSffU3rGswegSIkkCrM=">
+    <file short-path="copy.cpp" source-path="copy.cpp" line="63" class="def"/>
+    <base access="protected">
+      <type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+    </base>
+    <base access="protected">
+      <type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
+    </base>
+    <doc>
+      <brief>
+        <text>A class that should inherit functions as protected.</text>
+      </brief>
+    </doc>
     <function name="base_base_inherited" id="fmeE0HcB3oP1daboxYZOH/pxDwU=">
       <file short-path="copy.cpp" source-path="copy.cpp" line="23"/>
       <return>
@@ -517,23 +604,36 @@
         </returns>
       </doc>
     </function>
-    <function name="derived_shadowed" id="9BTAtv04iyibbbELEv2rF8AH+Uc=">
-      <file short-path="copy.cpp" source-path="copy.cpp" line="35"/>
+    <function name="derived_shadowed" id="oVVGDloOS5F7d4VIcKLc0YpnsiE=">
+      <file short-path="copy.cpp" source-path="copy.cpp" line="69"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+          <pointee-type id="KpfFXd3FeSffU3rGswegSIkkCrM=" name="protected_derived"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should be shadowed by derived classes.</text>
+          <text>This function should shadow the base class function.</text>
         </brief>
         <returns>
-          <text>A base class to test inheritance and shadowing</text>
+          <text>A class that should inherit functions as protected.</text>
         </returns>
       </doc>
     </function>
-    <function name="do_base_base_inherited" id="Jif8i0TqV0aN5cctSlCwsvdid/s=">
+    <function name="excluded_inherited" id="H8wEIL8+8s3iNqadfPsH1HWRQU4=">
+      <file short-path="copy.cpp" source-path="copy.cpp" line="9"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be inherited by derived classes.</text>
+        </brief>
+      </doc>
+    </function>
+    <function name="do_base_base_inherited" access="protected" id="Jif8i0TqV0aN5cctSlCwsvdid/s=">
       <file short-path="copy.cpp" source-path="copy.cpp" line="26"/>
       <return>
         <type class="lvalue-reference">
@@ -581,19 +681,19 @@
         </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" access="protected" id="ZJGKp3yoIaFScOAN2naqfrJMlQQ=">
-      <file short-path="copy.cpp" source-path="copy.cpp" line="42"/>
+    <function name="do_derived_shadowed" access="protected" id="4ZJznHda5QNdk/tsMca4Psswlj0=">
+      <file short-path="copy.cpp" source-path="copy.cpp" line="72"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+          <pointee-type id="KpfFXd3FeSffU3rGswegSIkkCrM=" name="protected_derived"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should be shadowed by derived classes.</text>
+          <text>This function should shadow the base class function.</text>
         </brief>
         <returns>
-          <text>A base class to test inheritance and shadowing</text>
+          <text>A class that should inherit functions as protected.</text>
         </returns>
       </doc>
     </function>
@@ -623,19 +723,6 @@
         </brief>
       </doc>
     </function>
-    <function name="excluded_inherited" id="H8wEIL8+8s3iNqadfPsH1HWRQU4=">
-      <file short-path="copy.cpp" source-path="copy.cpp" line="9"/>
-      <return>
-        <type class="lvalue-reference">
-          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
-        </type>
-      </return>
-      <doc>
-        <brief>
-          <text>This function should be inherited by derived classes.</text>
-        </brief>
-      </doc>
-    </function>
   </class>
 </namespace>
 </mrdocs>
diff --git a/test-files/golden-tests/config/inherit-base-members/nested.adoc b/test-files/golden-tests/config/inherit-base-members/nested.adoc
new file mode 100644
index 000000000..20a330d58
--- /dev/null
+++ b/test-files/golden-tests/config/inherit-base-members/nested.adoc
@@ -0,0 +1,289 @@
+= Reference
+:mrdocs:
+
+[#index]
+== Global namespace
+
+=== Types
+
+[cols=1]
+|===
+| Name
+| link:#X[`X`] 
+|===
+
+[#X]
+== X
+
+=== Synopsis
+
+Declared in `&lt;nested&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+struct X;
+----
+
+=== Types
+
+[cols=2]
+|===
+| Name
+| Description
+| link:#X-base[`base`] 
+| A base class to test inheritance and shadowing
+| link:#X-derived[`derived`] 
+| A class that derives from base and excluded&lowbar;base
+|===
+
+[#X-base]
+== link:#X[X]::base
+
+A base class to test inheritance and shadowing
+
+=== Synopsis
+
+Declared in `&lt;nested&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+class base;
+----
+
+=== Member Functions
+
+[cols=2]
+|===
+| Name
+| Description
+| link:#X-base-derived_shadowed[`derived&lowbar;shadowed`] 
+| This function should be shadowed by derived classes&period;
+| link:#X-base-base_inherited[`base&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+|===
+
+=== Protected Member Functions
+
+[cols=2]
+|===
+| Name
+| Description
+| link:#X-base-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
+| This function should be shadowed by derived classes&period;
+| link:#X-base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+|===
+
+=== Derived Classes
+
+[cols=2]
+|===
+| Name
+| Description
+| link:#X-derived[`derived`]
+| A class that derives from base and excluded&lowbar;base
+|===
+
+[#X-base-derived_shadowed]
+== link:#X[X]::link:#X-base[base]::derived&lowbar;shadowed
+
+This function should be shadowed by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;nested&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+link:#X-base[base]&
+derived&lowbar;shadowed();
+----
+
+=== Return Value
+
+A base class to test inheritance and shadowing
+
+[#X-base-base_inherited]
+== link:#X[X]::link:#X-base[base]::base&lowbar;inherited
+
+This function should be inherited by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;nested&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+link:#X-base[base]&
+base&lowbar;inherited();
+----
+
+=== Return Value
+
+A base class to test inheritance and shadowing
+
+[#X-base-do_derived_shadowed]
+== link:#X[X]::link:#X-base[base]::do&lowbar;derived&lowbar;shadowed
+
+This function should be shadowed by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;nested&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+link:#X-base[base]&
+do&lowbar;derived&lowbar;shadowed();
+----
+
+=== Return Value
+
+A base class to test inheritance and shadowing
+
+[#X-base-do_base_inherited]
+== link:#X[X]::link:#X-base[base]::do&lowbar;base&lowbar;inherited
+
+This function should be inherited by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;nested&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+link:#X-base[base]&
+do&lowbar;base&lowbar;inherited();
+----
+
+=== Return Value
+
+A base class to test inheritance and shadowing
+
+[#X-derived]
+== link:#X[X]::derived
+
+A class that derives from base and excluded&lowbar;base
+
+=== Synopsis
+
+Declared in `&lt;nested&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+class derived
+    : public link:#X-base[base]
+----
+
+=== Base Classes
+
+[cols=2]
+|===
+| Name
+| Description
+| `link:#X-base[base]`
+| A base class to test inheritance and shadowing
+|===
+
+=== Member Functions
+
+[cols=2]
+|===
+| Name
+| Description
+| link:#X-derived-derived_shadowed[`derived&lowbar;shadowed`] 
+| This function should shadow the base class function&period;
+| link:#X-derived-base_inherited[`base&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+|===
+
+=== Protected Member Functions
+
+[cols=2]
+|===
+| Name
+| Description
+| link:#X-derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
+| This function should shadow the base class function&period;
+| link:#X-derived-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+|===
+
+[#X-derived-derived_shadowed]
+== link:#X[X]::link:#X-derived[derived]::derived&lowbar;shadowed
+
+This function should shadow the base class function&period;
+
+=== Synopsis
+
+Declared in `&lt;nested&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+link:#X-derived[derived]&
+derived&lowbar;shadowed();
+----
+
+=== Return Value
+
+A class that derives from base and excluded&lowbar;base
+
+[#X-derived-base_inherited]
+== link:#X[X]::link:#X-derived[derived]::base&lowbar;inherited
+
+This function should be inherited by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;nested&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+link:#X-base[base]&
+base&lowbar;inherited();
+----
+
+=== Return Value
+
+A base class to test inheritance and shadowing
+
+[#X-derived-do_derived_shadowed]
+== link:#X[X]::link:#X-derived[derived]::do&lowbar;derived&lowbar;shadowed
+
+This function should shadow the base class function&period;
+
+=== Synopsis
+
+Declared in `&lt;nested&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+link:#X-derived[derived]&
+do&lowbar;derived&lowbar;shadowed();
+----
+
+=== Return Value
+
+A class that derives from base and excluded&lowbar;base
+
+[#X-derived-do_base_inherited]
+== link:#X[X]::link:#X-derived[derived]::do&lowbar;base&lowbar;inherited
+
+This function should be inherited by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;nested&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+link:#X-base[base]&
+do&lowbar;base&lowbar;inherited();
+----
+
+=== Return Value
+
+A base class to test inheritance and shadowing
+
+
+[.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/config/inherit-base-members/nested.cpp b/test-files/golden-tests/config/inherit-base-members/nested.cpp
new file mode 100644
index 000000000..8964f0693
--- /dev/null
+++ b/test-files/golden-tests/config/inherit-base-members/nested.cpp
@@ -0,0 +1,29 @@
+struct X
+{
+    /// A base class to test inheritance and shadowing
+    class base
+    {
+    public:
+        /// This function should be shadowed by derived classes.
+        base& derived_shadowed();
+        /// This function should be inherited by derived classes.
+        base& base_inherited();
+    protected:
+        /// This function should be shadowed by derived classes.
+        base& do_derived_shadowed();
+        /// This function should be inherited by derived classes.
+        base& do_base_inherited();
+    };
+
+    /// A class that derives from base and excluded_base
+    class derived
+        : public base
+    {
+    public:
+        /// This function should shadow the base class function.
+        derived& derived_shadowed();
+    protected:
+        /// This function should shadow the base class function.
+        derived& do_derived_shadowed();
+    };
+};
diff --git a/test-files/golden-tests/config/inherit-base-members/nested.html b/test-files/golden-tests/config/inherit-base-members/nested.html
new file mode 100644
index 000000000..f4ee58099
--- /dev/null
+++ b/test-files/golden-tests/config/inherit-base-members/nested.html
@@ -0,0 +1,388 @@
+<html lang="en">
+<head>
+<title>Reference</title>
+</head>
+<body>
+<div>
+<h1>Reference</h1>
+<div>
+<div>
+<h2 id="index"><a href="#index"></a></h2>
+</div>
+<h2>Types</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#X"><code>X</code></a> </td></tr>
+</tbody>
+</table>
+
+</div>
+<div>
+<div>
+<h2 id="X"><a href="#X">X</a></h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;nested.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">struct X;
+
+</code>
+</pre>
+</div>
+<h2>Types</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#X-base"><code>base</code></a> </td><td><span>A base class to test inheritance and shadowing</span></td></tr><tr>
+<td><a href="#X-derived"><code>derived</code></a> </td><td><span>A class that derives from base and excluded_base</span></td></tr>
+</tbody>
+</table>
+
+
+
+</div>
+<div>
+<div>
+<h2 id="X-base"><a href="#X-base">X::base</a></h2>
+<div>
+<span>A base class to test inheritance and shadowing</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;nested.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">class base;
+
+</code>
+</pre>
+</div>
+<h2>Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#X-base-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
+<td><a href="#X-base-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr>
+</tbody>
+</table>
+
+
+<h2>Protected Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#X-base-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
+<td><a href="#X-base-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr>
+</tbody>
+</table>
+
+
+<div>
+<h2>Derived Classes</h2>
+<table>
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr><td><a href="#X-derived"><code>derived</code></a>
+    </td><td><span>A class that derives from base and excluded_base</span></td></tr>
+</tbody>
+</table>
+</div>
+</div>
+<div>
+<div>
+<h2 id="X-base-derived_shadowed"><a href="#X-base-derived_shadowed">X::base::derived_shadowed</a></h2>
+<div>
+<span>This function should be shadowed by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;nested.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp"><a href="#X-base">base</a>&
+derived_shadowed();
+
+</code>
+</pre>
+</div>
+<div>
+<h3>Return Value</h3>
+<span>A base class to test inheritance and shadowing</span>
+</div>
+</div>
+<div>
+<div>
+<h2 id="X-base-base_inherited"><a href="#X-base-base_inherited">X::base::base_inherited</a></h2>
+<div>
+<span>This function should be inherited by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;nested.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp"><a href="#X-base">base</a>&
+base_inherited();
+
+</code>
+</pre>
+</div>
+<div>
+<h3>Return Value</h3>
+<span>A base class to test inheritance and shadowing</span>
+</div>
+</div>
+<div>
+<div>
+<h2 id="X-base-do_derived_shadowed"><a href="#X-base-do_derived_shadowed">X::base::do_derived_shadowed</a></h2>
+<div>
+<span>This function should be shadowed by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;nested.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp"><a href="#X-base">base</a>&
+do_derived_shadowed();
+
+</code>
+</pre>
+</div>
+<div>
+<h3>Return Value</h3>
+<span>A base class to test inheritance and shadowing</span>
+</div>
+</div>
+<div>
+<div>
+<h2 id="X-base-do_base_inherited"><a href="#X-base-do_base_inherited">X::base::do_base_inherited</a></h2>
+<div>
+<span>This function should be inherited by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;nested.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp"><a href="#X-base">base</a>&
+do_base_inherited();
+
+</code>
+</pre>
+</div>
+<div>
+<h3>Return Value</h3>
+<span>A base class to test inheritance and shadowing</span>
+</div>
+</div>
+<div>
+<div>
+<h2 id="X-derived"><a href="#X-derived">X::derived</a></h2>
+<div>
+<span>A class that derives from base and excluded_base</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;nested.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">class derived
+    : public <a href="#X-base">base</a>
+
+</code>
+</pre>
+</div>
+<div>
+<h2>Base Classes</h2>
+<table>
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr><td><code><a href="#X-base">base</a></code></td><td><span>A base class to test inheritance and shadowing</span></td></tr>
+</tbody>
+</table>
+</div>
+<h2>Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#X-derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
+<td><a href="#X-derived-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr>
+</tbody>
+</table>
+
+
+<h2>Protected Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#X-derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
+<td><a href="#X-derived-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr>
+</tbody>
+</table>
+
+
+</div>
+<div>
+<div>
+<h2 id="X-derived-derived_shadowed"><a href="#X-derived-derived_shadowed">X::derived::derived_shadowed</a></h2>
+<div>
+<span>This function should shadow the base class function.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;nested.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp"><a href="#X-derived">derived</a>&
+derived_shadowed();
+
+</code>
+</pre>
+</div>
+<div>
+<h3>Return Value</h3>
+<span>A class that derives from base and excluded_base</span>
+</div>
+</div>
+<div>
+<div>
+<h2 id="X-derived-base_inherited"><a href="#X-derived-base_inherited">X::derived::base_inherited</a></h2>
+<div>
+<span>This function should be inherited by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;nested.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp"><a href="#X-base">base</a>&
+base_inherited();
+
+</code>
+</pre>
+</div>
+<div>
+<h3>Return Value</h3>
+<span>A base class to test inheritance and shadowing</span>
+</div>
+</div>
+<div>
+<div>
+<h2 id="X-derived-do_derived_shadowed"><a href="#X-derived-do_derived_shadowed">X::derived::do_derived_shadowed</a></h2>
+<div>
+<span>This function should shadow the base class function.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;nested.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp"><a href="#X-derived">derived</a>&
+do_derived_shadowed();
+
+</code>
+</pre>
+</div>
+<div>
+<h3>Return Value</h3>
+<span>A class that derives from base and excluded_base</span>
+</div>
+</div>
+<div>
+<div>
+<h2 id="X-derived-do_base_inherited"><a href="#X-derived-do_base_inherited">X::derived::do_base_inherited</a></h2>
+<div>
+<span>This function should be inherited by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;nested.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp"><a href="#X-base">base</a>&
+do_base_inherited();
+
+</code>
+</pre>
+</div>
+<div>
+<h3>Return Value</h3>
+<span>A base class to test inheritance and shadowing</span>
+</div>
+</div>
+
+</div>
+<div>
+<h4>Created with <a href="https://www.mrdocs.com">MrDocs</a></h4>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/test-files/golden-tests/config/inherit-base-members/nested.xml b/test-files/golden-tests/config/inherit-base-members/nested.xml
new file mode 100644
index 000000000..b75b18a8f
--- /dev/null
+++ b/test-files/golden-tests/config/inherit-base-members/nested.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mrdocs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
+<namespace id="//////////////////////////8=">
+  <struct name="X" id="ynx5NXMLXqzSXwgOnIP6CHzNx14=">
+    <file short-path="nested.cpp" source-path="nested.cpp" line="1" class="def"/>
+    <class name="base" id="sqgIhnnAmDJJYpN2HkQo3u20Rts=">
+      <file short-path="nested.cpp" source-path="nested.cpp" line="4" class="def"/>
+      <doc>
+        <brief>
+          <text>A base class to test inheritance and shadowing</text>
+        </brief>
+      </doc>
+      <function name="derived_shadowed" id="005KWc0cDuIXusVqNC3iz7bggrg=">
+        <file short-path="nested.cpp" source-path="nested.cpp" line="8"/>
+        <return>
+          <type class="lvalue-reference">
+            <pointee-type id="sqgIhnnAmDJJYpN2HkQo3u20Rts=" name="base"/>
+          </type>
+        </return>
+        <doc>
+          <brief>
+            <text>This function should be shadowed by derived classes.</text>
+          </brief>
+          <returns>
+            <text>A base class to test inheritance and shadowing</text>
+          </returns>
+        </doc>
+      </function>
+      <function name="base_inherited" id="GNjdfwLhqmhFsMEtE7A8ZYOKsOk=">
+        <file short-path="nested.cpp" source-path="nested.cpp" line="10"/>
+        <return>
+          <type class="lvalue-reference">
+            <pointee-type id="sqgIhnnAmDJJYpN2HkQo3u20Rts=" name="base"/>
+          </type>
+        </return>
+        <doc>
+          <brief>
+            <text>This function should be inherited by derived classes.</text>
+          </brief>
+          <returns>
+            <text>A base class to test inheritance and shadowing</text>
+          </returns>
+        </doc>
+      </function>
+      <function name="do_derived_shadowed" access="protected" id="o+FGBeq78sPRIDwviOXOdALrO5I=">
+        <file short-path="nested.cpp" source-path="nested.cpp" line="13"/>
+        <return>
+          <type class="lvalue-reference">
+            <pointee-type id="sqgIhnnAmDJJYpN2HkQo3u20Rts=" name="base"/>
+          </type>
+        </return>
+        <doc>
+          <brief>
+            <text>This function should be shadowed by derived classes.</text>
+          </brief>
+          <returns>
+            <text>A base class to test inheritance and shadowing</text>
+          </returns>
+        </doc>
+      </function>
+      <function name="do_base_inherited" access="protected" id="+DNf0rb4E0Si5eWcoLxSUIOWD00=">
+        <file short-path="nested.cpp" source-path="nested.cpp" line="15"/>
+        <return>
+          <type class="lvalue-reference">
+            <pointee-type id="sqgIhnnAmDJJYpN2HkQo3u20Rts=" name="base"/>
+          </type>
+        </return>
+        <doc>
+          <brief>
+            <text>This function should be inherited by derived classes.</text>
+          </brief>
+          <returns>
+            <text>A base class to test inheritance and shadowing</text>
+          </returns>
+        </doc>
+      </function>
+    </class>
+    <class name="derived" id="dI2dt22EMTsj67EigiIMS/Snxbo=">
+      <file short-path="nested.cpp" source-path="nested.cpp" line="19" class="def"/>
+      <base>
+        <type id="sqgIhnnAmDJJYpN2HkQo3u20Rts=" name="base"/>
+      </base>
+      <doc>
+        <brief>
+          <text>A class that derives from base and excluded_base</text>
+        </brief>
+      </doc>
+      <function name="derived_shadowed" id="24dLgGeIsb7BnGdOR8aymkPbGEw=">
+        <file short-path="nested.cpp" source-path="nested.cpp" line="24"/>
+        <return>
+          <type class="lvalue-reference">
+            <pointee-type id="dI2dt22EMTsj67EigiIMS/Snxbo=" name="derived"/>
+          </type>
+        </return>
+        <doc>
+          <brief>
+            <text>This function should shadow the base class function.</text>
+          </brief>
+          <returns>
+            <text>A class that derives from base and excluded_base</text>
+          </returns>
+        </doc>
+      </function>
+      <function name="base_inherited" id="auHEWIpK87O/c52BodqmrY9MDa0=">
+        <file short-path="nested.cpp" source-path="nested.cpp" line="10"/>
+        <return>
+          <type class="lvalue-reference">
+            <pointee-type id="sqgIhnnAmDJJYpN2HkQo3u20Rts=" name="base"/>
+          </type>
+        </return>
+        <doc>
+          <brief>
+            <text>This function should be inherited by derived classes.</text>
+          </brief>
+          <returns>
+            <text>A base class to test inheritance and shadowing</text>
+          </returns>
+        </doc>
+      </function>
+      <function name="do_derived_shadowed" access="protected" id="niyMtSx2NqFzSCfMKpjQIhrvqwY=">
+        <file short-path="nested.cpp" source-path="nested.cpp" line="27"/>
+        <return>
+          <type class="lvalue-reference">
+            <pointee-type id="dI2dt22EMTsj67EigiIMS/Snxbo=" name="derived"/>
+          </type>
+        </return>
+        <doc>
+          <brief>
+            <text>This function should shadow the base class function.</text>
+          </brief>
+          <returns>
+            <text>A class that derives from base and excluded_base</text>
+          </returns>
+        </doc>
+      </function>
+      <function name="do_base_inherited" access="protected" id="B+8bxHl0B04FWcjyS5XwzWlx6N4=">
+        <file short-path="nested.cpp" source-path="nested.cpp" line="15"/>
+        <return>
+          <type class="lvalue-reference">
+            <pointee-type id="sqgIhnnAmDJJYpN2HkQo3u20Rts=" name="base"/>
+          </type>
+        </return>
+        <doc>
+          <brief>
+            <text>This function should be inherited by derived classes.</text>
+          </brief>
+          <returns>
+            <text>A base class to test inheritance and shadowing</text>
+          </returns>
+        </doc>
+      </function>
+    </class>
+  </struct>
+</namespace>
+</mrdocs>
diff --git a/test-files/golden-tests/config/inherit-base-members/nested.yml b/test-files/golden-tests/config/inherit-base-members/nested.yml
new file mode 100644
index 000000000..5a9766d7f
--- /dev/null
+++ b/test-files/golden-tests/config/inherit-base-members/nested.yml
@@ -0,0 +1,5 @@
+inherit-base-members: copy-all
+exclude-symbols:
+  - excluded_base
+extract-private-bases: true
+warn-no-paramdoc: false
\ No newline at end of file
diff --git a/test-files/golden-tests/config/inherit-base-members/never.adoc b/test-files/golden-tests/config/inherit-base-members/never.adoc
index 12603fb45..266ab76ce 100644
--- a/test-files/golden-tests/config/inherit-base-members/never.adoc
+++ b/test-files/golden-tests/config/inherit-base-members/never.adoc
@@ -221,6 +221,14 @@ class base&lowbar;base;
 | Description
 | link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
+|===
+
+=== Protected Member Functions
+
+[cols=2]
+|===
+| Name
+| Description
 | link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 |===
@@ -309,6 +317,14 @@ class derived
 | Description
 | link:#derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
+|===
+
+=== Protected Member Functions
+
+[cols=2]
+|===
+| Name
+| Description
 | link:#derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
 |===
@@ -375,6 +391,14 @@ class private&lowbar;derived
 | Description
 | link:#private_derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
+|===
+
+=== Protected Member Functions
+
+[cols=2]
+|===
+| Name
+| Description
 | link:#private_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
 |===
@@ -453,6 +477,14 @@ class protected&lowbar;derived
 | Description
 | link:#protected_derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
+|===
+
+=== Protected Member Functions
+
+[cols=2]
+|===
+| Name
+| Description
 | link:#protected_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
 |===
diff --git a/test-files/golden-tests/config/inherit-base-members/never.cpp b/test-files/golden-tests/config/inherit-base-members/never.cpp
index eff6deaf5..0a5efa42c 100644
--- a/test-files/golden-tests/config/inherit-base-members/never.cpp
+++ b/test-files/golden-tests/config/inherit-base-members/never.cpp
@@ -21,7 +21,7 @@ class base_base {
 public:
     /// This function should be indirectly inherited by derived classes.
     base_base& base_base_inherited();
-public:
+protected:
     /// This function should be indirectly inherited by derived classes.
     base_base& do_base_base_inherited();
 };
@@ -54,7 +54,7 @@ class derived
 public:
     /// This function should shadow the base class function.
     derived& derived_shadowed();
-public:
+protected:
     /// This function should shadow the base class function.
     derived& do_derived_shadowed();
 };
@@ -67,7 +67,7 @@ class protected_derived
 public:
     /// This function should shadow the base class function.
     protected_derived& derived_shadowed();
-public:
+protected:
     /// This function should shadow the base class function.
     protected_derived& do_derived_shadowed();
 };
@@ -80,7 +80,7 @@ class private_derived
 public:
     /// This function should shadow the base class function.
     private_derived& derived_shadowed();
-public:
+protected:
     /// This function should shadow the base class function.
     private_derived& do_derived_shadowed();
 };
diff --git a/test-files/golden-tests/config/inherit-base-members/never.html b/test-files/golden-tests/config/inherit-base-members/never.html
index dd80b4f49..d3a81c87c 100644
--- a/test-files/golden-tests/config/inherit-base-members/never.html
+++ b/test-files/golden-tests/config/inherit-base-members/never.html
@@ -283,12 +283,25 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
-<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
+<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
 </tbody>
 </table>
 
 
+<h2>Protected Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
+</tbody>
+</table>
+
 
 <div>
 <h2>Derived Classes</h2>
@@ -399,12 +412,25 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
-<td><a href="#derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
+<td><a href="#derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
 </tbody>
 </table>
 
 
+<h2>Protected Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
+</tbody>
+</table>
+
 
 </div>
 <div>
@@ -485,12 +511,25 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#private_derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
-<td><a href="#private_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
+<td><a href="#private_derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
 </tbody>
 </table>
 
 
+<h2>Protected Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#private_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
+</tbody>
+</table>
+
 
 </div>
 <div>
@@ -586,12 +625,25 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#protected_derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
-<td><a href="#protected_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
+<td><a href="#protected_derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
 </tbody>
 </table>
 
 
+<h2>Protected Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#protected_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
+</tbody>
+</table>
+
 
 </div>
 <div>
diff --git a/test-files/golden-tests/config/inherit-base-members/never.xml b/test-files/golden-tests/config/inherit-base-members/never.xml
index f34168d4d..d0d4fa217 100644
--- a/test-files/golden-tests/config/inherit-base-members/never.xml
+++ b/test-files/golden-tests/config/inherit-base-members/never.xml
@@ -132,7 +132,7 @@
         </returns>
       </doc>
     </function>
-    <function name="do_base_base_inherited" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
+    <function name="do_base_base_inherited" access="protected" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
       <file short-path="never.cpp" source-path="never.cpp" line="26"/>
       <return>
         <type class="lvalue-reference">
@@ -178,7 +178,7 @@
         </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" id="rTSnS8Pv8GoWusQQE42y0pgN4cw=">
+    <function name="do_derived_shadowed" access="protected" id="rTSnS8Pv8GoWusQQE42y0pgN4cw=">
       <file short-path="never.cpp" source-path="never.cpp" line="59"/>
       <return>
         <type class="lvalue-reference">
@@ -224,7 +224,7 @@
         </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" id="NJYWKnKWmizdaSr1ldC7FGh7fD0=">
+    <function name="do_derived_shadowed" access="protected" id="NJYWKnKWmizdaSr1ldC7FGh7fD0=">
       <file short-path="never.cpp" source-path="never.cpp" line="85"/>
       <return>
         <type class="lvalue-reference">
@@ -270,7 +270,7 @@
         </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" id="4ZJznHda5QNdk/tsMca4Psswlj0=">
+    <function name="do_derived_shadowed" access="protected" id="4ZJznHda5QNdk/tsMca4Psswlj0=">
       <file short-path="never.cpp" source-path="never.cpp" line="72"/>
       <return>
         <type class="lvalue-reference">
diff --git a/test-files/golden-tests/config/inherit-base-members/reference.adoc b/test-files/golden-tests/config/inherit-base-members/reference.adoc
index 4970145c6..6e7931258 100644
--- a/test-files/golden-tests/config/inherit-base-members/reference.adoc
+++ b/test-files/golden-tests/config/inherit-base-members/reference.adoc
@@ -61,8 +61,6 @@ class base
 | This function should shadow the excluded&lowbar;base function&period;
 | link:#base-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should be shadowed by derived classes&period;
-| link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
-| This function should be indirectly inherited by derived classes&period;
 |===
 
 === Protected Member Functions
@@ -71,6 +69,8 @@ class base
 |===
 | Name
 | Description
+| link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
 | link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
@@ -225,6 +225,14 @@ class base&lowbar;base;
 | Description
 | link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
+|===
+
+=== Protected Member Functions
+
+[cols=2]
+|===
+| Name
+| Description
 | link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 |===
@@ -319,10 +327,6 @@ class derived
 | This function should shadow the excluded&lowbar;base function&period;
 | link:#derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
-| link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
-| This function should be indirectly inherited by derived classes&period;
-| link:#derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
-| This function should shadow the base class function&period;
 |===
 
 === Protected Member Functions
@@ -331,12 +335,14 @@ class derived
 |===
 | Name
 | Description
+| link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
 | link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
 | This function should shadow the excluded&lowbar;base function&period;
-| link:#base-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
-| This function should be shadowed by derived classes&period;
+| link:#derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
+| This function should shadow the base class function&period;
 |===
 
 [#derived-derived_shadowed]
@@ -399,8 +405,28 @@ class private&lowbar;derived
 |===
 | Name
 | Description
+| link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
+| link:#base-base_inherited[`base&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+| link:#base-base_shadowed[`base&lowbar;shadowed`] 
+| This function should shadow the excluded&lowbar;base function&period;
 | link:#private_derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
+|===
+
+=== Protected Member Functions
+
+[cols=2]
+|===
+| Name
+| Description
+| link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
+| link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+| link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
+| This function should shadow the excluded&lowbar;base function&period;
 | link:#private_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
 |===
@@ -477,10 +503,14 @@ class protected&lowbar;derived
 |===
 | Name
 | Description
+| link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
+| link:#base-base_inherited[`base&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+| link:#base-base_shadowed[`base&lowbar;shadowed`] 
+| This function should shadow the excluded&lowbar;base function&period;
 | link:#protected_derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
-| link:#protected_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
-| This function should shadow the base class function&period;
 |===
 
 === Protected Member Functions
@@ -489,22 +519,14 @@ class protected&lowbar;derived
 |===
 | Name
 | Description
-| link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
-| This function should be indirectly inherited by derived classes&period;
-| link:#base-base_inherited[`base&lowbar;inherited`] 
-| This function should be inherited by derived classes&period;
-| link:#base-base_shadowed[`base&lowbar;shadowed`] 
-| This function should shadow the excluded&lowbar;base function&period;
-| link:#base-derived_shadowed[`derived&lowbar;shadowed`] 
-| This function should be shadowed by derived classes&period;
 | link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 | link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
 | This function should shadow the excluded&lowbar;base function&period;
-| link:#base-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
-| This function should be shadowed by derived classes&period;
+| link:#protected_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
+| This function should shadow the base class function&period;
 |===
 
 [#protected_derived-derived_shadowed]
diff --git a/test-files/golden-tests/config/inherit-base-members/reference.cpp b/test-files/golden-tests/config/inherit-base-members/reference.cpp
index eff6deaf5..0a5efa42c 100644
--- a/test-files/golden-tests/config/inherit-base-members/reference.cpp
+++ b/test-files/golden-tests/config/inherit-base-members/reference.cpp
@@ -21,7 +21,7 @@ class base_base {
 public:
     /// This function should be indirectly inherited by derived classes.
     base_base& base_base_inherited();
-public:
+protected:
     /// This function should be indirectly inherited by derived classes.
     base_base& do_base_base_inherited();
 };
@@ -54,7 +54,7 @@ class derived
 public:
     /// This function should shadow the base class function.
     derived& derived_shadowed();
-public:
+protected:
     /// This function should shadow the base class function.
     derived& do_derived_shadowed();
 };
@@ -67,7 +67,7 @@ class protected_derived
 public:
     /// This function should shadow the base class function.
     protected_derived& derived_shadowed();
-public:
+protected:
     /// This function should shadow the base class function.
     protected_derived& do_derived_shadowed();
 };
@@ -80,7 +80,7 @@ class private_derived
 public:
     /// This function should shadow the base class function.
     private_derived& derived_shadowed();
-public:
+protected:
     /// This function should shadow the base class function.
     private_derived& do_derived_shadowed();
 };
diff --git a/test-files/golden-tests/config/inherit-base-members/reference.html b/test-files/golden-tests/config/inherit-base-members/reference.html
index 731d0faae..7daa4f9ad 100644
--- a/test-files/golden-tests/config/inherit-base-members/reference.html
+++ b/test-files/golden-tests/config/inherit-base-members/reference.html
@@ -74,8 +74,7 @@ <h2>Member Functions</h2>
 <td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#base-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
-<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
+<td><a href="#base-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
 </tbody>
 </table>
 
@@ -90,6 +89,7 @@ <h2>Protected Member Functions</h2>
 </thead>
 <tbody>
 <tr>
+<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
 <td><a href="#base-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
@@ -285,12 +285,25 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
-<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
+<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
 </tbody>
 </table>
 
 
+<h2>Protected Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
+</tbody>
+</table>
+
 
 <div>
 <h2>Derived Classes</h2>
@@ -404,9 +417,7 @@ <h2>Member Functions</h2>
 <td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
-<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
-<td><a href="#derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
+<td><a href="#derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
 </tbody>
 </table>
 
@@ -421,9 +432,10 @@ <h2>Protected Member Functions</h2>
 </thead>
 <tbody>
 <tr>
+<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#base-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
+<td><a href="#derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
 </tbody>
 </table>
 
@@ -507,12 +519,31 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#private_derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
-<td><a href="#private_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
+<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
+<td><a href="#base-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
+<td><a href="#base-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
+<td><a href="#private_derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
 </tbody>
 </table>
 
 
+<h2>Protected Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
+<td><a href="#base-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
+<td><a href="#base-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
+<td><a href="#private_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
+</tbody>
+</table>
+
 
 </div>
 <div>
@@ -608,8 +639,10 @@ <h2>Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#protected_derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
-<td><a href="#protected_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
+<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
+<td><a href="#base-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
+<td><a href="#base-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
+<td><a href="#protected_derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
 </tbody>
 </table>
 
@@ -624,14 +657,10 @@ <h2>Protected Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
-<td><a href="#base-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
-<td><a href="#base-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#base-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
 <td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#base-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
+<td><a href="#protected_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
 </tbody>
 </table>
 
diff --git a/test-files/golden-tests/config/inherit-base-members/reference.xml b/test-files/golden-tests/config/inherit-base-members/reference.xml
index 6c1d01927..6a981d1bd 100644
--- a/test-files/golden-tests/config/inherit-base-members/reference.xml
+++ b/test-files/golden-tests/config/inherit-base-members/reference.xml
@@ -76,7 +76,7 @@
         </returns>
       </doc>
     </function>
-    <function name="do_base_base_inherited" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
+    <function name="do_base_base_inherited" access="protected" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
       <file short-path="reference.cpp" source-path="reference.cpp" line="26"/>
       <return>
         <type class="lvalue-reference">
@@ -164,7 +164,7 @@
         </returns>
       </doc>
     </function>
-    <function name="do_base_base_inherited" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
+    <function name="do_base_base_inherited" access="protected" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
       <file short-path="reference.cpp" source-path="reference.cpp" line="26"/>
       <return>
         <type class="lvalue-reference">
@@ -258,7 +258,7 @@
         </returns>
       </doc>
     </function>
-    <function name="do_base_base_inherited" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
+    <function name="do_base_base_inherited" access="protected" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
       <file short-path="reference.cpp" source-path="reference.cpp" line="26"/>
       <return>
         <type class="lvalue-reference">
@@ -274,22 +274,6 @@
         </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" id="rTSnS8Pv8GoWusQQE42y0pgN4cw=">
-      <file short-path="reference.cpp" source-path="reference.cpp" line="59"/>
-      <return>
-        <type class="lvalue-reference">
-          <pointee-type id="ABxWcxit2TyVLv16ZxoJKAc6LKw=" name="derived"/>
-        </type>
-      </return>
-      <doc>
-        <brief>
-          <text>This function should shadow the base class function.</text>
-        </brief>
-        <returns>
-          <text>A class that derives from base and excluded_base</text>
-        </returns>
-      </doc>
-    </function>
     <function name="do_base_inherited" access="protected" id="TaKAQiDmx8UXkT9p/momqiOZyHU=">
       <file short-path="reference.cpp" source-path="reference.cpp" line="46"/>
       <return>
@@ -322,19 +306,19 @@
         </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" access="protected" id="KGOrnDVJV2nPDK1hlkvBm6diYXY=">
-      <file short-path="reference.cpp" source-path="reference.cpp" line="42"/>
+    <function name="do_derived_shadowed" access="protected" id="rTSnS8Pv8GoWusQQE42y0pgN4cw=">
+      <file short-path="reference.cpp" source-path="reference.cpp" line="59"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+          <pointee-type id="ABxWcxit2TyVLv16ZxoJKAc6LKw=" name="derived"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should be shadowed by derived classes.</text>
+          <text>This function should shadow the base class function.</text>
         </brief>
         <returns>
-          <text>A base class to test inheritance and shadowing</text>
+          <text>A class that derives from base and excluded_base</text>
         </returns>
       </doc>
     </function>
@@ -352,6 +336,54 @@
         <text>A class that uses private inheritance only</text>
       </brief>
     </doc>
+    <function name="base_base_inherited" id="2D7yc6q3buDhuPwzpn4pWzbu8ls=">
+      <file short-path="reference.cpp" source-path="reference.cpp" line="23"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=" name="base_base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be indirectly inherited by derived classes.</text>
+        </brief>
+        <returns>
+          <text>A second-order base class to test indirect inheritance</text>
+        </returns>
+      </doc>
+    </function>
+    <function name="base_inherited" id="v0BroyWjs67MHzc1SyTlXrSxn8M=">
+      <file short-path="reference.cpp" source-path="reference.cpp" line="39"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be inherited by derived classes.</text>
+        </brief>
+        <returns>
+          <text>A base class to test inheritance and shadowing</text>
+        </returns>
+      </doc>
+    </function>
+    <function name="base_shadowed" id="ECBBLxlaKar55qA0k1BCFn6MdH8=">
+      <file short-path="reference.cpp" source-path="reference.cpp" line="37"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should shadow the excluded_base function.</text>
+        </brief>
+        <returns>
+          <text>A base class to test inheritance and shadowing</text>
+        </returns>
+      </doc>
+    </function>
     <function name="derived_shadowed" id="9wqRoOH7cwNhkz5vwpTHLeb01BY=">
       <file short-path="reference.cpp" source-path="reference.cpp" line="82"/>
       <return>
@@ -368,57 +400,59 @@
         </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" id="NJYWKnKWmizdaSr1ldC7FGh7fD0=">
-      <file short-path="reference.cpp" source-path="reference.cpp" line="85"/>
+    <function name="do_base_base_inherited" access="protected" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
+      <file short-path="reference.cpp" source-path="reference.cpp" line="26"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="aiF6nWGZXbG8UfC75J5tNuoPMRc=" name="private_derived"/>
+          <pointee-type id="/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=" name="base_base"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should shadow the base class function.</text>
+          <text>This function should be indirectly inherited by derived classes.</text>
         </brief>
         <returns>
-          <text>A class that uses private inheritance only</text>
+          <text>A second-order base class to test indirect inheritance</text>
         </returns>
       </doc>
     </function>
-  </class>
-  <class name="protected_derived" id="KpfFXd3FeSffU3rGswegSIkkCrM=">
-    <file short-path="reference.cpp" source-path="reference.cpp" line="63" class="def"/>
-    <base access="protected">
-      <type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
-    </base>
-    <base access="protected">
-      <type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
-    </base>
-    <doc>
-      <brief>
-        <text>A class that should inherit functions as protected.</text>
-      </brief>
-    </doc>
-    <function name="derived_shadowed" id="oVVGDloOS5F7d4VIcKLc0YpnsiE=">
-      <file short-path="reference.cpp" source-path="reference.cpp" line="69"/>
+    <function name="do_base_inherited" access="protected" id="TaKAQiDmx8UXkT9p/momqiOZyHU=">
+      <file short-path="reference.cpp" source-path="reference.cpp" line="46"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="KpfFXd3FeSffU3rGswegSIkkCrM=" name="protected_derived"/>
+          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should shadow the base class function.</text>
+          <text>This function should be inherited by derived classes.</text>
         </brief>
         <returns>
-          <text>A class that should inherit functions as protected.</text>
+          <text>A base class to test inheritance and shadowing</text>
         </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" id="4ZJznHda5QNdk/tsMca4Psswlj0=">
-      <file short-path="reference.cpp" source-path="reference.cpp" line="72"/>
+    <function name="do_base_shadowed" access="protected" id="eHxe3z0iWUXdcNyXK0PD2+6DRbs=">
+      <file short-path="reference.cpp" source-path="reference.cpp" line="44"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="KpfFXd3FeSffU3rGswegSIkkCrM=" name="protected_derived"/>
+          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should shadow the excluded_base function.</text>
+        </brief>
+        <returns>
+          <text>A base class to test inheritance and shadowing</text>
+        </returns>
+      </doc>
+    </function>
+    <function name="do_derived_shadowed" access="protected" id="NJYWKnKWmizdaSr1ldC7FGh7fD0=">
+      <file short-path="reference.cpp" source-path="reference.cpp" line="85"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="aiF6nWGZXbG8UfC75J5tNuoPMRc=" name="private_derived"/>
         </type>
       </return>
       <doc>
@@ -426,10 +460,24 @@
           <text>This function should shadow the base class function.</text>
         </brief>
         <returns>
-          <text>A class that should inherit functions as protected.</text>
+          <text>A class that uses private inheritance only</text>
         </returns>
       </doc>
     </function>
+  </class>
+  <class name="protected_derived" id="KpfFXd3FeSffU3rGswegSIkkCrM=">
+    <file short-path="reference.cpp" source-path="reference.cpp" line="63" class="def"/>
+    <base access="protected">
+      <type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+    </base>
+    <base access="protected">
+      <type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
+    </base>
+    <doc>
+      <brief>
+        <text>A class that should inherit functions as protected.</text>
+      </brief>
+    </doc>
     <function name="base_base_inherited" id="2D7yc6q3buDhuPwzpn4pWzbu8ls=">
       <file short-path="reference.cpp" source-path="reference.cpp" line="23"/>
       <return>
@@ -478,23 +526,23 @@
         </returns>
       </doc>
     </function>
-    <function name="derived_shadowed" id="aYhSUMJkgCRo3AZmBb/rre04Ghg=">
-      <file short-path="reference.cpp" source-path="reference.cpp" line="35"/>
+    <function name="derived_shadowed" id="oVVGDloOS5F7d4VIcKLc0YpnsiE=">
+      <file short-path="reference.cpp" source-path="reference.cpp" line="69"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+          <pointee-type id="KpfFXd3FeSffU3rGswegSIkkCrM=" name="protected_derived"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should be shadowed by derived classes.</text>
+          <text>This function should shadow the base class function.</text>
         </brief>
         <returns>
-          <text>A base class to test inheritance and shadowing</text>
+          <text>A class that should inherit functions as protected.</text>
         </returns>
       </doc>
     </function>
-    <function name="do_base_base_inherited" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
+    <function name="do_base_base_inherited" access="protected" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
       <file short-path="reference.cpp" source-path="reference.cpp" line="26"/>
       <return>
         <type class="lvalue-reference">
@@ -542,19 +590,19 @@
         </returns>
       </doc>
     </function>
-    <function name="do_derived_shadowed" access="protected" id="KGOrnDVJV2nPDK1hlkvBm6diYXY=">
-      <file short-path="reference.cpp" source-path="reference.cpp" line="42"/>
+    <function name="do_derived_shadowed" access="protected" id="4ZJznHda5QNdk/tsMca4Psswlj0=">
+      <file short-path="reference.cpp" source-path="reference.cpp" line="72"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+          <pointee-type id="KpfFXd3FeSffU3rGswegSIkkCrM=" name="protected_derived"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should be shadowed by derived classes.</text>
+          <text>This function should shadow the base class function.</text>
         </brief>
         <returns>
-          <text>A base class to test inheritance and shadowing</text>
+          <text>A class that should inherit functions as protected.</text>
         </returns>
       </doc>
     </function>
diff --git a/test-files/golden-tests/config/inherit-base-members/skip-special.adoc b/test-files/golden-tests/config/inherit-base-members/skip-special.adoc
index ce79aba4d..6a92af9ab 100644
--- a/test-files/golden-tests/config/inherit-base-members/skip-special.adoc
+++ b/test-files/golden-tests/config/inherit-base-members/skip-special.adoc
@@ -63,8 +63,6 @@ class base
 | This function should shadow the excluded&lowbar;base function&period;
 | link:#base-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should be shadowed by derived classes&period;
-| link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
-| This function should be indirectly inherited by derived classes&period;
 |===
 
 === Protected Member Functions
@@ -73,6 +71,8 @@ class base
 |===
 | Name
 | Description
+| link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
 | link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
@@ -233,6 +233,14 @@ class base&lowbar;base;
 | Destructor should not be inherited
 | link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
+|===
+
+=== Protected Member Functions
+
+[cols=2]
+|===
+| Name
+| Description
 | link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 |===
@@ -349,10 +357,6 @@ class derived
 | This function should shadow the excluded&lowbar;base function&period;
 | link:#derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
-| link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
-| This function should be indirectly inherited by derived classes&period;
-| link:#derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
-| This function should shadow the base class function&period;
 | link:#derived-excluded_inherited[`excluded&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 |===
@@ -363,12 +367,14 @@ class derived
 |===
 | Name
 | Description
+| link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
 | link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
 | This function should shadow the excluded&lowbar;base function&period;
-| link:#base-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
-| This function should be shadowed by derived classes&period;
+| link:#derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
+| This function should shadow the base class function&period;
 | link:#derived-do_excluded_inherited[`do&lowbar;excluded&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#derived-do_shadowed[`do&lowbar;shadowed`] 
@@ -418,10 +424,10 @@ link:#derived[derived]&
 derived&lowbar;shadowed();
 ----
 
-[#derived-do_derived_shadowed]
-== link:#derived[derived]::do&lowbar;derived&lowbar;shadowed
+[#derived-excluded_inherited]
+== link:#derived[derived]::excluded&lowbar;inherited
 
-This function should shadow the base class function&period;
+This function should be inherited by derived classes&period;
 
 === Synopsis
 
@@ -429,14 +435,14 @@ Declared in `&lt;skip&hyphen;special&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-link:#derived[derived]&
-do&lowbar;derived&lowbar;shadowed();
+excluded&lowbar;base&
+excluded&lowbar;inherited();
 ----
 
-[#derived-excluded_inherited]
-== link:#derived[derived]::excluded&lowbar;inherited
+[#derived-do_derived_shadowed]
+== link:#derived[derived]::do&lowbar;derived&lowbar;shadowed
 
-This function should be inherited by derived classes&period;
+This function should shadow the base class function&period;
 
 === Synopsis
 
@@ -444,8 +450,8 @@ Declared in `&lt;skip&hyphen;special&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-excluded&lowbar;base&
-excluded&lowbar;inherited();
+link:#derived[derived]&
+do&lowbar;derived&lowbar;shadowed();
 ----
 
 [#derived-do_excluded_inherited]
@@ -502,10 +508,36 @@ class private&lowbar;derived
 | Constructor should not be inherited
 | link:#private_derived-2destructor[`&#126;private&lowbar;derived`] [.small]#[destructor]#
 | Destructor should not be inherited
+| link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
+| link:#base-base_inherited[`base&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+| link:#base-base_shadowed[`base&lowbar;shadowed`] 
+| This function should shadow the excluded&lowbar;base function&period;
 | link:#private_derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
+| link:#private_derived-excluded_inherited[`excluded&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+|===
+
+=== Protected Member Functions
+
+[cols=2]
+|===
+| Name
+| Description
+| link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
+| link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+| link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
+| This function should shadow the excluded&lowbar;base function&period;
 | link:#private_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
+| link:#private_derived-do_excluded_inherited[`do&lowbar;excluded&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+| link:#private_derived-do_shadowed[`do&lowbar;shadowed`] 
+| This function should be shadowed by derived classes&period;
 |===
 
 [#private_derived-2constructor]
@@ -551,6 +583,21 @@ link:#private_derived[private&lowbar;derived]&
 derived&lowbar;shadowed();
 ----
 
+[#private_derived-excluded_inherited]
+== link:#private_derived[private&lowbar;derived]::excluded&lowbar;inherited
+
+This function should be inherited by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;skip&hyphen;special&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+excluded&lowbar;base&
+excluded&lowbar;inherited();
+----
+
 [#private_derived-do_derived_shadowed]
 == link:#private_derived[private&lowbar;derived]::do&lowbar;derived&lowbar;shadowed
 
@@ -566,6 +613,36 @@ link:#private_derived[private&lowbar;derived]&
 do&lowbar;derived&lowbar;shadowed();
 ----
 
+[#private_derived-do_excluded_inherited]
+== link:#private_derived[private&lowbar;derived]::do&lowbar;excluded&lowbar;inherited
+
+This function should be inherited by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;skip&hyphen;special&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+excluded&lowbar;base&
+do&lowbar;excluded&lowbar;inherited();
+----
+
+[#private_derived-do_shadowed]
+== link:#private_derived[private&lowbar;derived]::do&lowbar;shadowed
+
+This function should be shadowed by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;skip&hyphen;special&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+excluded&lowbar;base&
+do&lowbar;shadowed();
+----
+
 [#protected_derived]
 == protected&lowbar;derived
 
@@ -604,10 +681,16 @@ class protected&lowbar;derived
 | Constructor should not be inherited
 | link:#protected_derived-2destructor[`&#126;protected&lowbar;derived`] [.small]#[destructor]#
 | Destructor should not be inherited
+| link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
+| This function should be indirectly inherited by derived classes&period;
+| link:#base-base_inherited[`base&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
+| link:#base-base_shadowed[`base&lowbar;shadowed`] 
+| This function should shadow the excluded&lowbar;base function&period;
 | link:#protected_derived-derived_shadowed[`derived&lowbar;shadowed`] 
 | This function should shadow the base class function&period;
-| link:#protected_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
-| This function should shadow the base class function&period;
+| link:#protected_derived-excluded_inherited[`excluded&lowbar;inherited`] 
+| This function should be inherited by derived classes&period;
 |===
 
 === Protected Member Functions
@@ -616,28 +699,18 @@ class protected&lowbar;derived
 |===
 | Name
 | Description
-| link:#base_base-base_base_inherited[`base&lowbar;base&lowbar;inherited`] 
-| This function should be indirectly inherited by derived classes&period;
-| link:#base-base_inherited[`base&lowbar;inherited`] 
-| This function should be inherited by derived classes&period;
-| link:#base-base_shadowed[`base&lowbar;shadowed`] 
-| This function should shadow the excluded&lowbar;base function&period;
-| link:#base-derived_shadowed[`derived&lowbar;shadowed`] 
-| This function should be shadowed by derived classes&period;
 | link:#base_base-do_base_base_inherited[`do&lowbar;base&lowbar;base&lowbar;inherited`] 
 | This function should be indirectly inherited by derived classes&period;
 | link:#base-do_base_inherited[`do&lowbar;base&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#base-do_base_shadowed[`do&lowbar;base&lowbar;shadowed`] 
 | This function should shadow the excluded&lowbar;base function&period;
-| link:#base-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
-| This function should be shadowed by derived classes&period;
+| link:#protected_derived-do_derived_shadowed[`do&lowbar;derived&lowbar;shadowed`] 
+| This function should shadow the base class function&period;
 | link:#protected_derived-do_excluded_inherited[`do&lowbar;excluded&lowbar;inherited`] 
 | This function should be inherited by derived classes&period;
 | link:#protected_derived-do_shadowed[`do&lowbar;shadowed`] 
 | This function should be shadowed by derived classes&period;
-| link:#protected_derived-excluded_inherited[`excluded&lowbar;inherited`] 
-| This function should be inherited by derived classes&period;
 |===
 
 [#protected_derived-2constructor]
@@ -687,6 +760,21 @@ derived&lowbar;shadowed();
 
 Should inherit functions as protected&period;
 
+[#protected_derived-excluded_inherited]
+== link:#protected_derived[protected&lowbar;derived]::excluded&lowbar;inherited
+
+This function should be inherited by derived classes&period;
+
+=== Synopsis
+
+Declared in `&lt;skip&hyphen;special&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+excluded&lowbar;base&
+excluded&lowbar;inherited();
+----
+
 [#protected_derived-do_derived_shadowed]
 == link:#protected_derived[protected&lowbar;derived]::do&lowbar;derived&lowbar;shadowed
 
@@ -736,20 +824,5 @@ excluded&lowbar;base&
 do&lowbar;shadowed();
 ----
 
-[#protected_derived-excluded_inherited]
-== link:#protected_derived[protected&lowbar;derived]::excluded&lowbar;inherited
-
-This function should be inherited by derived classes&period;
-
-=== Synopsis
-
-Declared in `&lt;skip&hyphen;special&period;cpp&gt;`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-excluded&lowbar;base&
-excluded&lowbar;inherited();
-----
-
 
 [.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/config/inherit-base-members/skip-special.cpp b/test-files/golden-tests/config/inherit-base-members/skip-special.cpp
index b8ac9b61d..d4cd97243 100644
--- a/test-files/golden-tests/config/inherit-base-members/skip-special.cpp
+++ b/test-files/golden-tests/config/inherit-base-members/skip-special.cpp
@@ -36,7 +36,7 @@ class base_base {
 
     /// This function should be indirectly inherited by derived classes.
     base_base& base_base_inherited();
-public:
+protected:
     /// This function should be indirectly inherited by derived classes.
     base_base& do_base_base_inherited();
 };
@@ -79,7 +79,7 @@ class derived
 
     /// This function should shadow the base class function.
     derived& derived_shadowed();
-public:
+protected:
     /// This function should shadow the base class function.
     derived& do_derived_shadowed();
 };
@@ -98,7 +98,7 @@ class protected_derived
 
     /// This function should shadow the base class function.
     protected_derived& derived_shadowed();
-public:
+protected:
     /// This function should shadow the base class function.
     protected_derived& do_derived_shadowed();
 };
@@ -116,7 +116,7 @@ class private_derived
 
     /// This function should shadow the base class function.
     private_derived& derived_shadowed();
-public:
+protected:
     /// This function should shadow the base class function.
     private_derived& do_derived_shadowed();
 };
diff --git a/test-files/golden-tests/config/inherit-base-members/skip-special.html b/test-files/golden-tests/config/inherit-base-members/skip-special.html
index a047bd876..63f270bfb 100644
--- a/test-files/golden-tests/config/inherit-base-members/skip-special.html
+++ b/test-files/golden-tests/config/inherit-base-members/skip-special.html
@@ -72,8 +72,7 @@ <h2>Member Functions</h2>
 <td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#base-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
-<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
+<td><a href="#base-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
 </tbody>
 </table>
 
@@ -88,6 +87,7 @@ <h2>Protected Member Functions</h2>
 </thead>
 <tbody>
 <tr>
+<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
 <td><a href="#base-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
@@ -295,12 +295,25 @@ <h2>Member Functions</h2>
 <tr>
 <td><a href="#base_base-2constructor"><code>base_base</code></a>         <span class="small">[constructor]</span></td><td><span>Constructor should not be inherited</span></td></tr><tr>
 <td><a href="#base_base-2destructor"><code>~base_base</code></a> <span class="small">[destructor]</span></td><td><span>Destructor should not be inherited</span></td></tr><tr>
-<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
-<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
+<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
 </tbody>
 </table>
 
 
+<h2>Protected Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr>
+</tbody>
+</table>
+
 
 <div>
 <h2>Derived Classes</h2>
@@ -443,8 +456,6 @@ <h2>Member Functions</h2>
 <td><a href="#base-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
 <td><a href="#derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
-<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
-<td><a href="#derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
 <td><a href="#derived-excluded_inherited"><code>excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr>
 </tbody>
 </table>
@@ -460,9 +471,10 @@ <h2>Protected Member Functions</h2>
 </thead>
 <tbody>
 <tr>
+<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#base-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
+<td><a href="#derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
 <td><a href="#derived-do_excluded_inherited"><code>do_excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#derived-do_shadowed"><code>do_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
 </tbody>
@@ -530,9 +542,9 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-do_derived_shadowed"><a href="#derived-do_derived_shadowed">derived::do_derived_shadowed</a></h2>
+<h2 id="derived-excluded_inherited"><a href="#derived-excluded_inherited">derived::excluded_inherited</a></h2>
 <div>
-<span>This function should shadow the base class function.</span>
+<span>This function should be inherited by derived classes.</span>
 
 </div>
 </div>
@@ -541,8 +553,8 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;skip-special.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp"><a href="#derived">derived</a>&
-do_derived_shadowed();
+<code class="source-code cpp">excluded_base&
+excluded_inherited();
 
 </code>
 </pre>
@@ -550,9 +562,9 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="derived-excluded_inherited"><a href="#derived-excluded_inherited">derived::excluded_inherited</a></h2>
+<h2 id="derived-do_derived_shadowed"><a href="#derived-do_derived_shadowed">derived::do_derived_shadowed</a></h2>
 <div>
-<span>This function should be inherited by derived classes.</span>
+<span>This function should shadow the base class function.</span>
 
 </div>
 </div>
@@ -561,8 +573,8 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;skip-special.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp">excluded_base&
-excluded_inherited();
+<code class="source-code cpp"><a href="#derived">derived</a>&
+do_derived_shadowed();
 
 </code>
 </pre>
@@ -636,12 +648,34 @@ <h2>Member Functions</h2>
 <tr>
 <td><a href="#private_derived-2constructor"><code>private_derived</code></a>         <span class="small">[constructor]</span></td><td><span>Constructor should not be inherited</span></td></tr><tr>
 <td><a href="#private_derived-2destructor"><code>~private_derived</code></a> <span class="small">[destructor]</span></td><td><span>Destructor should not be inherited</span></td></tr><tr>
+<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
+<td><a href="#base-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
+<td><a href="#base-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
 <td><a href="#private_derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
-<td><a href="#private_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
+<td><a href="#private_derived-excluded_inherited"><code>excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr>
 </tbody>
 </table>
 
 
+<h2>Protected Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
+<td><a href="#base-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
+<td><a href="#base-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
+<td><a href="#private_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
+<td><a href="#private_derived-do_excluded_inherited"><code>do_excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
+<td><a href="#private_derived-do_shadowed"><code>do_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
+</tbody>
+</table>
+
 
 </div>
 <div>
@@ -698,6 +732,26 @@ <h3>Synopsis</h3>
 <code class="source-code cpp"><a href="#private_derived">private_derived</a>&
 derived_shadowed();
 
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
+<h2 id="private_derived-excluded_inherited"><a href="#private_derived-excluded_inherited">private_derived::excluded_inherited</a></h2>
+<div>
+<span>This function should be inherited by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;skip-special.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">excluded_base&
+excluded_inherited();
+
 </code>
 </pre>
 </div>
@@ -718,6 +772,46 @@ <h3>Synopsis</h3>
 <code class="source-code cpp"><a href="#private_derived">private_derived</a>&
 do_derived_shadowed();
 
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
+<h2 id="private_derived-do_excluded_inherited"><a href="#private_derived-do_excluded_inherited">private_derived::do_excluded_inherited</a></h2>
+<div>
+<span>This function should be inherited by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;skip-special.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">excluded_base&
+do_excluded_inherited();
+
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
+<h2 id="private_derived-do_shadowed"><a href="#private_derived-do_shadowed">private_derived::do_shadowed</a></h2>
+<div>
+<span>This function should be shadowed by derived classes.</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;skip-special.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">excluded_base&
+do_shadowed();
+
 </code>
 </pre>
 </div>
@@ -769,8 +863,11 @@ <h2>Member Functions</h2>
 <tr>
 <td><a href="#protected_derived-2constructor"><code>protected_derived</code></a>         <span class="small">[constructor]</span></td><td><span>Constructor should not be inherited</span></td></tr><tr>
 <td><a href="#protected_derived-2destructor"><code>~protected_derived</code></a> <span class="small">[destructor]</span></td><td><span>Destructor should not be inherited</span></td></tr><tr>
+<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
+<td><a href="#base-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
+<td><a href="#base-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
 <td><a href="#protected_derived-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
-<td><a href="#protected_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr>
+<td><a href="#protected_derived-excluded_inherited"><code>excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr>
 </tbody>
 </table>
 
@@ -785,17 +882,12 @@ <h2>Protected Member Functions</h2>
 </thead>
 <tbody>
 <tr>
-<td><a href="#base_base-base_base_inherited"><code>base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
-<td><a href="#base-base_inherited"><code>base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
-<td><a href="#base-base_shadowed"><code>base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#base-derived_shadowed"><code>derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
 <td><a href="#base_base-do_base_base_inherited"><code>do_base_base_inherited</code></a> </td><td><span>This function should be indirectly inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_inherited"><code>do_base_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
 <td><a href="#base-do_base_shadowed"><code>do_base_shadowed</code></a> </td><td><span>This function should shadow the excluded_base function.</span></td></tr><tr>
-<td><a href="#base-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
+<td><a href="#protected_derived-do_derived_shadowed"><code>do_derived_shadowed</code></a> </td><td><span>This function should shadow the base class function.</span></td></tr><tr>
 <td><a href="#protected_derived-do_excluded_inherited"><code>do_excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr><tr>
-<td><a href="#protected_derived-do_shadowed"><code>do_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr><tr>
-<td><a href="#protected_derived-excluded_inherited"><code>excluded_inherited</code></a> </td><td><span>This function should be inherited by derived classes.</span></td></tr>
+<td><a href="#protected_derived-do_shadowed"><code>do_shadowed</code></a> </td><td><span>This function should be shadowed by derived classes.</span></td></tr>
 </tbody>
 </table>
 
@@ -865,9 +957,9 @@ <h3>Return Value</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_derived_shadowed"><a href="#protected_derived-do_derived_shadowed">protected_derived::do_derived_shadowed</a></h2>
+<h2 id="protected_derived-excluded_inherited"><a href="#protected_derived-excluded_inherited">protected_derived::excluded_inherited</a></h2>
 <div>
-<span>This function should shadow the base class function.</span>
+<span>This function should be inherited by derived classes.</span>
 
 </div>
 </div>
@@ -876,22 +968,18 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;skip-special.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp"><a href="#protected_derived">protected_derived</a>&
-do_derived_shadowed();
+<code class="source-code cpp">excluded_base&
+excluded_inherited();
 
 </code>
 </pre>
 </div>
-<div>
-<h3>Return Value</h3>
-<span>Should inherit functions as protected.</span>
-</div>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_excluded_inherited"><a href="#protected_derived-do_excluded_inherited">protected_derived::do_excluded_inherited</a></h2>
+<h2 id="protected_derived-do_derived_shadowed"><a href="#protected_derived-do_derived_shadowed">protected_derived::do_derived_shadowed</a></h2>
 <div>
-<span>This function should be inherited by derived classes.</span>
+<span>This function should shadow the base class function.</span>
 
 </div>
 </div>
@@ -900,18 +988,22 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;skip-special.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp">excluded_base&
-do_excluded_inherited();
+<code class="source-code cpp"><a href="#protected_derived">protected_derived</a>&
+do_derived_shadowed();
 
 </code>
 </pre>
 </div>
+<div>
+<h3>Return Value</h3>
+<span>Should inherit functions as protected.</span>
+</div>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-do_shadowed"><a href="#protected_derived-do_shadowed">protected_derived::do_shadowed</a></h2>
+<h2 id="protected_derived-do_excluded_inherited"><a href="#protected_derived-do_excluded_inherited">protected_derived::do_excluded_inherited</a></h2>
 <div>
-<span>This function should be shadowed by derived classes.</span>
+<span>This function should be inherited by derived classes.</span>
 
 </div>
 </div>
@@ -921,7 +1013,7 @@ <h3>Synopsis</h3>
 Declared in <code>&lt;skip-special.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">excluded_base&
-do_shadowed();
+do_excluded_inherited();
 
 </code>
 </pre>
@@ -929,9 +1021,9 @@ <h3>Synopsis</h3>
 </div>
 <div>
 <div>
-<h2 id="protected_derived-excluded_inherited"><a href="#protected_derived-excluded_inherited">protected_derived::excluded_inherited</a></h2>
+<h2 id="protected_derived-do_shadowed"><a href="#protected_derived-do_shadowed">protected_derived::do_shadowed</a></h2>
 <div>
-<span>This function should be inherited by derived classes.</span>
+<span>This function should be shadowed by derived classes.</span>
 
 </div>
 </div>
@@ -941,7 +1033,7 @@ <h3>Synopsis</h3>
 Declared in <code>&lt;skip-special.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">excluded_base&
-excluded_inherited();
+do_shadowed();
 
 </code>
 </pre>
diff --git a/test-files/golden-tests/config/inherit-base-members/skip-special.xml b/test-files/golden-tests/config/inherit-base-members/skip-special.xml
index bbb51ca5e..baa98f1b4 100644
--- a/test-files/golden-tests/config/inherit-base-members/skip-special.xml
+++ b/test-files/golden-tests/config/inherit-base-members/skip-special.xml
@@ -75,7 +75,7 @@
         </brief>
       </doc>
     </function>
-    <function name="do_base_base_inherited" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
+    <function name="do_base_base_inherited" access="protected" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
       <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="41"/>
       <return>
         <type class="lvalue-reference">
@@ -159,7 +159,7 @@
         </brief>
       </doc>
     </function>
-    <function name="do_base_base_inherited" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
+    <function name="do_base_base_inherited" access="protected" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
       <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="41"/>
       <return>
         <type class="lvalue-reference">
@@ -249,42 +249,29 @@
         </brief>
       </doc>
     </function>
-    <function name="do_base_base_inherited" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
-      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="41"/>
-      <return>
-        <type class="lvalue-reference">
-          <pointee-type id="/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=" name="base_base"/>
-        </type>
-      </return>
-      <doc>
-        <brief>
-          <text>This function should be indirectly inherited by derived classes.</text>
-        </brief>
-      </doc>
-    </function>
-    <function name="do_derived_shadowed" id="rTSnS8Pv8GoWusQQE42y0pgN4cw=">
-      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="84"/>
+    <function name="excluded_inherited" id="P1Eq799RJkNMSTci+0jy+ZejsyU=">
+      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="19"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="ABxWcxit2TyVLv16ZxoJKAc6LKw=" name="derived"/>
+          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should shadow the base class function.</text>
+          <text>This function should be inherited by derived classes.</text>
         </brief>
       </doc>
     </function>
-    <function name="excluded_inherited" id="P1Eq799RJkNMSTci+0jy+ZejsyU=">
-      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="19"/>
+    <function name="do_base_base_inherited" access="protected" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
+      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="41"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
+          <pointee-type id="/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=" name="base_base"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should be inherited by derived classes.</text>
+          <text>This function should be indirectly inherited by derived classes.</text>
         </brief>
       </doc>
     </function>
@@ -314,16 +301,16 @@
         </brief>
       </doc>
     </function>
-    <function name="do_derived_shadowed" access="protected" id="KGOrnDVJV2nPDK1hlkvBm6diYXY=">
-      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="62"/>
+    <function name="do_derived_shadowed" access="protected" id="rTSnS8Pv8GoWusQQE42y0pgN4cw=">
+      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="84"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+          <pointee-type id="ABxWcxit2TyVLv16ZxoJKAc6LKw=" name="derived"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should be shadowed by derived classes.</text>
+          <text>This function should shadow the base class function.</text>
         </brief>
       </doc>
     </function>
@@ -378,6 +365,45 @@
         </brief>
       </doc>
     </function>
+    <function name="base_base_inherited" id="2D7yc6q3buDhuPwzpn4pWzbu8ls=">
+      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="38"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=" name="base_base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be indirectly inherited by derived classes.</text>
+        </brief>
+      </doc>
+    </function>
+    <function name="base_inherited" id="v0BroyWjs67MHzc1SyTlXrSxn8M=">
+      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="59"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be inherited by derived classes.</text>
+        </brief>
+      </doc>
+    </function>
+    <function name="base_shadowed" id="ECBBLxlaKar55qA0k1BCFn6MdH8=">
+      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="57"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should shadow the excluded_base function.</text>
+        </brief>
+      </doc>
+    </function>
     <function name="derived_shadowed" id="9wqRoOH7cwNhkz5vwpTHLeb01BY=">
       <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="118"/>
       <return>
@@ -391,7 +417,59 @@
         </brief>
       </doc>
     </function>
-    <function name="do_derived_shadowed" id="NJYWKnKWmizdaSr1ldC7FGh7fD0=">
+    <function name="excluded_inherited" id="GZtztJDtmlpSfr66pbZ66w0XBRY=">
+      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="19"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be inherited by derived classes.</text>
+        </brief>
+      </doc>
+    </function>
+    <function name="do_base_base_inherited" access="protected" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
+      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="41"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="/PcbLGG9Q7grLgSOV/R/ZnEg9Cs=" name="base_base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be indirectly inherited by derived classes.</text>
+        </brief>
+      </doc>
+    </function>
+    <function name="do_base_inherited" access="protected" id="TaKAQiDmx8UXkT9p/momqiOZyHU=">
+      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="66"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be inherited by derived classes.</text>
+        </brief>
+      </doc>
+    </function>
+    <function name="do_base_shadowed" access="protected" id="eHxe3z0iWUXdcNyXK0PD2+6DRbs=">
+      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="64"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should shadow the excluded_base function.</text>
+        </brief>
+      </doc>
+    </function>
+    <function name="do_derived_shadowed" access="protected" id="NJYWKnKWmizdaSr1ldC7FGh7fD0=">
       <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="121"/>
       <return>
         <type class="lvalue-reference">
@@ -404,6 +482,32 @@
         </brief>
       </doc>
     </function>
+    <function name="do_excluded_inherited" access="protected" id="bcAGvatJOmHfwquqeK/vawE7p6k=">
+      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="26"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be inherited by derived classes.</text>
+        </brief>
+      </doc>
+    </function>
+    <function name="do_shadowed" access="protected" id="fo/PP2HZqWRI2Sc4jY1ZzHUzKEI=">
+      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="22"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be shadowed by derived classes.</text>
+        </brief>
+      </doc>
+    </function>
   </class>
   <class name="protected_derived" id="KpfFXd3FeSffU3rGswegSIkkCrM=">
     <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="88" class="def"/>
@@ -434,38 +538,6 @@
         </brief>
       </doc>
     </function>
-    <function name="derived_shadowed" id="oVVGDloOS5F7d4VIcKLc0YpnsiE=">
-      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="100"/>
-      <return>
-        <type class="lvalue-reference">
-          <pointee-type id="KpfFXd3FeSffU3rGswegSIkkCrM=" name="protected_derived"/>
-        </type>
-      </return>
-      <doc>
-        <brief>
-          <text>This function should shadow the base class function.</text>
-        </brief>
-        <returns>
-          <text>Should inherit functions as protected.</text>
-        </returns>
-      </doc>
-    </function>
-    <function name="do_derived_shadowed" id="4ZJznHda5QNdk/tsMca4Psswlj0=">
-      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="103"/>
-      <return>
-        <type class="lvalue-reference">
-          <pointee-type id="KpfFXd3FeSffU3rGswegSIkkCrM=" name="protected_derived"/>
-        </type>
-      </return>
-      <doc>
-        <brief>
-          <text>This function should shadow the base class function.</text>
-        </brief>
-        <returns>
-          <text>Should inherit functions as protected.</text>
-        </returns>
-      </doc>
-    </function>
     <function name="base_base_inherited" id="2D7yc6q3buDhuPwzpn4pWzbu8ls=">
       <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="38"/>
       <return>
@@ -505,20 +577,36 @@
         </brief>
       </doc>
     </function>
-    <function name="derived_shadowed" id="aYhSUMJkgCRo3AZmBb/rre04Ghg=">
-      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="55"/>
+    <function name="derived_shadowed" id="oVVGDloOS5F7d4VIcKLc0YpnsiE=">
+      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="100"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+          <pointee-type id="KpfFXd3FeSffU3rGswegSIkkCrM=" name="protected_derived"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should be shadowed by derived classes.</text>
+          <text>This function should shadow the base class function.</text>
+        </brief>
+        <returns>
+          <text>Should inherit functions as protected.</text>
+        </returns>
+      </doc>
+    </function>
+    <function name="excluded_inherited" id="H8wEIL8+8s3iNqadfPsH1HWRQU4=">
+      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="19"/>
+      <return>
+        <type class="lvalue-reference">
+          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
+        </type>
+      </return>
+      <doc>
+        <brief>
+          <text>This function should be inherited by derived classes.</text>
         </brief>
       </doc>
     </function>
-    <function name="do_base_base_inherited" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
+    <function name="do_base_base_inherited" access="protected" id="MEPVWyGd8KdZFR1kBYlQMgPyQlo=">
       <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="41"/>
       <return>
         <type class="lvalue-reference">
@@ -557,17 +645,20 @@
         </brief>
       </doc>
     </function>
-    <function name="do_derived_shadowed" access="protected" id="KGOrnDVJV2nPDK1hlkvBm6diYXY=">
-      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="62"/>
+    <function name="do_derived_shadowed" access="protected" id="4ZJznHda5QNdk/tsMca4Psswlj0=">
+      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="103"/>
       <return>
         <type class="lvalue-reference">
-          <pointee-type id="sk8HTAQHhzXfZej4IJliADonAJQ=" name="base"/>
+          <pointee-type id="KpfFXd3FeSffU3rGswegSIkkCrM=" name="protected_derived"/>
         </type>
       </return>
       <doc>
         <brief>
-          <text>This function should be shadowed by derived classes.</text>
+          <text>This function should shadow the base class function.</text>
         </brief>
+        <returns>
+          <text>Should inherit functions as protected.</text>
+        </returns>
       </doc>
     </function>
     <function name="do_excluded_inherited" access="protected" id="KdkXQxu2xOfAXegJgCMmLcFq8MM=">
@@ -596,19 +687,6 @@
         </brief>
       </doc>
     </function>
-    <function name="excluded_inherited" id="H8wEIL8+8s3iNqadfPsH1HWRQU4=">
-      <file short-path="skip-special.cpp" source-path="skip-special.cpp" line="19"/>
-      <return>
-        <type class="lvalue-reference">
-          <pointee-type id="ZFBKKIr2vNG5u3bxIaTbccBBkvQ=" name="excluded_base"/>
-        </type>
-      </return>
-      <doc>
-        <brief>
-          <text>This function should be inherited by derived classes.</text>
-        </brief>
-      </doc>
-    </function>
   </class>
 </namespace>
 </mrdocs>
diff --git a/test-files/golden-tests/config/sort-members-by/sort-members-by-name.adoc b/test-files/golden-tests/config/sort-members-by/sort-members-by-name.adoc
index c71581bd8..c2610b6d6 100644
--- a/test-files/golden-tests/config/sort-members-by/sort-members-by-name.adoc
+++ b/test-files/golden-tests/config/sort-members-by/sort-members-by-name.adoc
@@ -59,16 +59,6 @@ Constructors
 
 Declared in `&lt;sort&hyphen;members&hyphen;by&hyphen;name&period;cpp&gt;`
 
-Default constructor
-
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-link:#Z-2constructor-05[Z]();
-----
-
-[.small]#link:#Z-2constructor-05[_» more&period;&period;&period;_]#
-
 Construct from `int`
 
 
@@ -79,20 +69,16 @@ link:#Z-2constructor-06[Z](int value);
 
 [.small]#link:#Z-2constructor-06[_» more&period;&period;&period;_]#
 
-[#Z-2constructor-05]
-== link:#Z[Z]::Z
-
 Default constructor
 
-=== Synopsis
-
-Declared in `&lt;sort&hyphen;members&hyphen;by&hyphen;name&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-Z();
+link:#Z-2constructor-05[Z]();
 ----
 
+[.small]#link:#Z-2constructor-05[_» more&period;&period;&period;_]#
+
 [#Z-2constructor-06]
 == link:#Z[Z]::Z
 
@@ -117,6 +103,20 @@ Z(int value);
 | The value to construct from
 |===
 
+[#Z-2constructor-05]
+== link:#Z[Z]::Z
+
+Default constructor
+
+=== Synopsis
+
+Declared in `&lt;sort&hyphen;members&hyphen;by&hyphen;name&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+Z();
+----
+
 [#Z-2destructor]
 == link:#Z[Z]::&#126;Z
 
diff --git a/test-files/golden-tests/config/sort-members-by/sort-members-by-name.html b/test-files/golden-tests/config/sort-members-by/sort-members-by-name.html
index 839f92eca..c24eef6ea 100644
--- a/test-files/golden-tests/config/sort-members-by/sort-members-by-name.html
+++ b/test-files/golden-tests/config/sort-members-by/sort-members-by-name.html
@@ -74,13 +74,6 @@ <h2 id="Z-2constructor-00"><a href="#Z-2constructor-00">Z::Z</a></h2>
 <h3>Synopses</h3>
 <div>
 Declared in <code>&lt;sort-members-by-name.cpp&gt;</code></div>
-<span>Default constructor</span>
-<pre>
-<code class="source-code cpp"><a href="#Z-2constructor-05">Z</a>();
-
-</code>
-</pre><span class="small"><a href="#Z-2constructor-05"><em>» more...</em></a></span>
-
 <span>Construct from <code>int</code></span>
 <pre>
 <code class="source-code cpp"><a href="#Z-2constructor-06">Z</a>(int value);
@@ -88,26 +81,14 @@ <h3>Synopses</h3>
 </code>
 </pre><span class="small"><a href="#Z-2constructor-06"><em>» more...</em></a></span>
 
-
-</div>
-</div>
-<div>
-<div>
-<h2 id="Z-2constructor-05"><a href="#Z-2constructor-05">Z::Z</a></h2>
-<div>
 <span>Default constructor</span>
-
-</div>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;sort-members-by-name.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp">Z();
+<code class="source-code cpp"><a href="#Z-2constructor-05">Z</a>();
 
 </code>
-</pre>
+</pre><span class="small"><a href="#Z-2constructor-05"><em>» more...</em></a></span>
+
+
 </div>
 </div>
 <div>
@@ -148,6 +129,25 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
+<h2 id="Z-2constructor-05"><a href="#Z-2constructor-05">Z::Z</a></h2>
+<div>
+<span>Default constructor</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;sort-members-by-name.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">Z();
+
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
 <h2 id="Z-2destructor"><a href="#Z-2destructor">Z::~Z</a></h2>
 <div>
 <span>Destructor</span>
diff --git a/test-files/golden-tests/config/sort-members-by/sort-members-by-name.xml b/test-files/golden-tests/config/sort-members-by/sort-members-by-name.xml
index ea7587b9a..8f1c00c19 100644
--- a/test-files/golden-tests/config/sort-members-by/sort-members-by-name.xml
+++ b/test-files/golden-tests/config/sort-members-by/sort-members-by-name.xml
@@ -4,14 +4,6 @@
 <namespace id="//////////////////////////8=">
   <struct name="Z" id="NQ8uQgTcafPcttyBMHHLHAXA4MA=">
     <file short-path="sort-members-by-name.cpp" source-path="sort-members-by-name.cpp" line="1" class="def"/>
-    <function class="constructor" name="Z" id="WltomC+2IcmzMN0COGL0OWWmbZk=">
-      <file short-path="sort-members-by-name.cpp" source-path="sort-members-by-name.cpp" line="11"/>
-      <doc>
-        <brief>
-          <text>Default constructor</text>
-        </brief>
-      </doc>
-    </function>
     <function class="constructor" name="Z" id="aQWtFVa4Xa+eceLXiLW74q44JRk=">
       <file short-path="sort-members-by-name.cpp" source-path="sort-members-by-name.cpp" line="10"/>
       <param name="value">
@@ -27,6 +19,14 @@
         </param>
       </doc>
     </function>
+    <function class="constructor" name="Z" id="WltomC+2IcmzMN0COGL0OWWmbZk=">
+      <file short-path="sort-members-by-name.cpp" source-path="sort-members-by-name.cpp" line="11"/>
+      <doc>
+        <brief>
+          <text>Default constructor</text>
+        </brief>
+      </doc>
+    </function>
     <function class="destructor" name="~Z" id="HMG56OCQ5OpB2E9hu4bG3/hoOho=">
       <file short-path="sort-members-by-name.cpp" source-path="sort-members-by-name.cpp" line="9"/>
       <doc>
diff --git a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.adoc b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.adoc
index 5819d534a..98b45f52a 100644
--- a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.adoc
+++ b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.adoc
@@ -191,16 +191,6 @@ Constructors
 
 Declared in `&lt;sort&hyphen;namespace&hyphen;members&hyphen;by&hyphen;location&period;cpp&gt;`
 
-Default constructor
-
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-link:#Z-2constructor-05[Z]();
-----
-
-[.small]#link:#Z-2constructor-05[_» more&period;&period;&period;_]#
-
 Construct from `int`
 
 
@@ -211,20 +201,16 @@ link:#Z-2constructor-06[Z](int value);
 
 [.small]#link:#Z-2constructor-06[_» more&period;&period;&period;_]#
 
-[#Z-2constructor-05]
-== link:#Z[Z]::Z
-
 Default constructor
 
-=== Synopsis
-
-Declared in `&lt;sort&hyphen;namespace&hyphen;members&hyphen;by&hyphen;location&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-Z();
+link:#Z-2constructor-05[Z]();
 ----
 
+[.small]#link:#Z-2constructor-05[_» more&period;&period;&period;_]#
+
 [#Z-2constructor-06]
 == link:#Z[Z]::Z
 
@@ -249,6 +235,20 @@ Z(int value);
 | The value to construct from
 |===
 
+[#Z-2constructor-05]
+== link:#Z[Z]::Z
+
+Default constructor
+
+=== Synopsis
+
+Declared in `&lt;sort&hyphen;namespace&hyphen;members&hyphen;by&hyphen;location&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+Z();
+----
+
 [#Z-2destructor]
 == link:#Z[Z]::&#126;Z
 
diff --git a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.html b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.html
index e90718cb6..0718c256a 100644
--- a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.html
+++ b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.html
@@ -246,13 +246,6 @@ <h2 id="Z-2constructor-00"><a href="#Z-2constructor-00">Z::Z</a></h2>
 <h3>Synopses</h3>
 <div>
 Declared in <code>&lt;sort-namespace-members-by-location.cpp&gt;</code></div>
-<span>Default constructor</span>
-<pre>
-<code class="source-code cpp"><a href="#Z-2constructor-05">Z</a>();
-
-</code>
-</pre><span class="small"><a href="#Z-2constructor-05"><em>» more...</em></a></span>
-
 <span>Construct from <code>int</code></span>
 <pre>
 <code class="source-code cpp"><a href="#Z-2constructor-06">Z</a>(int value);
@@ -260,26 +253,14 @@ <h3>Synopses</h3>
 </code>
 </pre><span class="small"><a href="#Z-2constructor-06"><em>» more...</em></a></span>
 
-
-</div>
-</div>
-<div>
-<div>
-<h2 id="Z-2constructor-05"><a href="#Z-2constructor-05">Z::Z</a></h2>
-<div>
 <span>Default constructor</span>
-
-</div>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;sort-namespace-members-by-location.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp">Z();
+<code class="source-code cpp"><a href="#Z-2constructor-05">Z</a>();
 
 </code>
-</pre>
+</pre><span class="small"><a href="#Z-2constructor-05"><em>» more...</em></a></span>
+
+
 </div>
 </div>
 <div>
@@ -320,6 +301,25 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
+<h2 id="Z-2constructor-05"><a href="#Z-2constructor-05">Z::Z</a></h2>
+<div>
+<span>Default constructor</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;sort-namespace-members-by-location.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">Z();
+
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
 <h2 id="Z-2destructor"><a href="#Z-2destructor">Z::~Z</a></h2>
 <div>
 <span>Destructor</span>
diff --git a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.xml b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.xml
index 0071193ec..b4057c78b 100644
--- a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.xml
+++ b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-location.xml
@@ -52,14 +52,6 @@
   </struct>
   <struct name="Z" id="NQ8uQgTcafPcttyBMHHLHAXA4MA=">
     <file short-path="sort-namespace-members-by-location.cpp" source-path="sort-namespace-members-by-location.cpp" line="23" class="def"/>
-    <function class="constructor" name="Z" id="WltomC+2IcmzMN0COGL0OWWmbZk=">
-      <file short-path="sort-namespace-members-by-location.cpp" source-path="sort-namespace-members-by-location.cpp" line="32"/>
-      <doc>
-        <brief>
-          <text>Default constructor</text>
-        </brief>
-      </doc>
-    </function>
     <function class="constructor" name="Z" id="aQWtFVa4Xa+eceLXiLW74q44JRk=">
       <file short-path="sort-namespace-members-by-location.cpp" source-path="sort-namespace-members-by-location.cpp" line="31"/>
       <param name="value">
@@ -75,6 +67,14 @@
         </param>
       </doc>
     </function>
+    <function class="constructor" name="Z" id="WltomC+2IcmzMN0COGL0OWWmbZk=">
+      <file short-path="sort-namespace-members-by-location.cpp" source-path="sort-namespace-members-by-location.cpp" line="32"/>
+      <doc>
+        <brief>
+          <text>Default constructor</text>
+        </brief>
+      </doc>
+    </function>
     <function class="destructor" name="~Z" id="HMG56OCQ5OpB2E9hu4bG3/hoOho=">
       <file short-path="sort-namespace-members-by-location.cpp" source-path="sort-namespace-members-by-location.cpp" line="30"/>
       <doc>
diff --git a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.adoc b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.adoc
index 1ba8bff7f..29b0b51d6 100644
--- a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.adoc
+++ b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.adoc
@@ -191,16 +191,6 @@ Constructors
 
 Declared in `&lt;sort&hyphen;namespace&hyphen;members&hyphen;by&hyphen;name&period;cpp&gt;`
 
-Default constructor
-
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-link:#Z-2constructor-05[Z]();
-----
-
-[.small]#link:#Z-2constructor-05[_» more&period;&period;&period;_]#
-
 Construct from `int`
 
 
@@ -211,20 +201,16 @@ link:#Z-2constructor-06[Z](int value);
 
 [.small]#link:#Z-2constructor-06[_» more&period;&period;&period;_]#
 
-[#Z-2constructor-05]
-== link:#Z[Z]::Z
-
 Default constructor
 
-=== Synopsis
-
-Declared in `&lt;sort&hyphen;namespace&hyphen;members&hyphen;by&hyphen;name&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-Z();
+link:#Z-2constructor-05[Z]();
 ----
 
+[.small]#link:#Z-2constructor-05[_» more&period;&period;&period;_]#
+
 [#Z-2constructor-06]
 == link:#Z[Z]::Z
 
@@ -249,6 +235,20 @@ Z(int value);
 | The value to construct from
 |===
 
+[#Z-2constructor-05]
+== link:#Z[Z]::Z
+
+Default constructor
+
+=== Synopsis
+
+Declared in `&lt;sort&hyphen;namespace&hyphen;members&hyphen;by&hyphen;name&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+Z();
+----
+
 [#Z-2destructor]
 == link:#Z[Z]::&#126;Z
 
diff --git a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.html b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.html
index 399b5f869..abbab300b 100644
--- a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.html
+++ b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.html
@@ -246,13 +246,6 @@ <h2 id="Z-2constructor-00"><a href="#Z-2constructor-00">Z::Z</a></h2>
 <h3>Synopses</h3>
 <div>
 Declared in <code>&lt;sort-namespace-members-by-name.cpp&gt;</code></div>
-<span>Default constructor</span>
-<pre>
-<code class="source-code cpp"><a href="#Z-2constructor-05">Z</a>();
-
-</code>
-</pre><span class="small"><a href="#Z-2constructor-05"><em>» more...</em></a></span>
-
 <span>Construct from <code>int</code></span>
 <pre>
 <code class="source-code cpp"><a href="#Z-2constructor-06">Z</a>(int value);
@@ -260,26 +253,14 @@ <h3>Synopses</h3>
 </code>
 </pre><span class="small"><a href="#Z-2constructor-06"><em>» more...</em></a></span>
 
-
-</div>
-</div>
-<div>
-<div>
-<h2 id="Z-2constructor-05"><a href="#Z-2constructor-05">Z::Z</a></h2>
-<div>
 <span>Default constructor</span>
-
-</div>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;sort-namespace-members-by-name.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp">Z();
+<code class="source-code cpp"><a href="#Z-2constructor-05">Z</a>();
 
 </code>
-</pre>
+</pre><span class="small"><a href="#Z-2constructor-05"><em>» more...</em></a></span>
+
+
 </div>
 </div>
 <div>
@@ -320,6 +301,25 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
+<h2 id="Z-2constructor-05"><a href="#Z-2constructor-05">Z::Z</a></h2>
+<div>
+<span>Default constructor</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;sort-namespace-members-by-name.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">Z();
+
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
 <h2 id="Z-2destructor"><a href="#Z-2destructor">Z::~Z</a></h2>
 <div>
 <span>Destructor</span>
diff --git a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.xml b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.xml
index db912f484..6e38cd1db 100644
--- a/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.xml
+++ b/test-files/golden-tests/config/sort-namespace-members-by/sort-namespace-members-by-name.xml
@@ -52,14 +52,6 @@
   </struct>
   <struct name="Z" id="NQ8uQgTcafPcttyBMHHLHAXA4MA=">
     <file short-path="sort-namespace-members-by-name.cpp" source-path="sort-namespace-members-by-name.cpp" line="23" class="def"/>
-    <function class="constructor" name="Z" id="WltomC+2IcmzMN0COGL0OWWmbZk=">
-      <file short-path="sort-namespace-members-by-name.cpp" source-path="sort-namespace-members-by-name.cpp" line="32"/>
-      <doc>
-        <brief>
-          <text>Default constructor</text>
-        </brief>
-      </doc>
-    </function>
     <function class="constructor" name="Z" id="aQWtFVa4Xa+eceLXiLW74q44JRk=">
       <file short-path="sort-namespace-members-by-name.cpp" source-path="sort-namespace-members-by-name.cpp" line="31"/>
       <param name="value">
@@ -75,6 +67,14 @@
         </param>
       </doc>
     </function>
+    <function class="constructor" name="Z" id="WltomC+2IcmzMN0COGL0OWWmbZk=">
+      <file short-path="sort-namespace-members-by-name.cpp" source-path="sort-namespace-members-by-name.cpp" line="32"/>
+      <doc>
+        <brief>
+          <text>Default constructor</text>
+        </brief>
+      </doc>
+    </function>
     <function class="destructor" name="~Z" id="HMG56OCQ5OpB2E9hu4bG3/hoOho=">
       <file short-path="sort-namespace-members-by-name.cpp" source-path="sort-namespace-members-by-name.cpp" line="30"/>
       <doc>
diff --git a/test-files/golden-tests/config/sort/sort-members.adoc b/test-files/golden-tests/config/sort/sort-members.adoc
index d0b9a0b30..57991f8a5 100644
--- a/test-files/golden-tests/config/sort/sort-members.adoc
+++ b/test-files/golden-tests/config/sort/sort-members.adoc
@@ -191,16 +191,6 @@ Constructors
 
 Declared in `&lt;sort&hyphen;members&period;cpp&gt;`
 
-Default constructor
-
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-link:#Z-2constructor-05[Z]();
-----
-
-[.small]#link:#Z-2constructor-05[_» more&period;&period;&period;_]#
-
 Construct from `int`
 
 
@@ -211,20 +201,16 @@ link:#Z-2constructor-06[Z](int value);
 
 [.small]#link:#Z-2constructor-06[_» more&period;&period;&period;_]#
 
-[#Z-2constructor-05]
-== link:#Z[Z]::Z
-
 Default constructor
 
-=== Synopsis
-
-Declared in `&lt;sort&hyphen;members&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-Z();
+link:#Z-2constructor-05[Z]();
 ----
 
+[.small]#link:#Z-2constructor-05[_» more&period;&period;&period;_]#
+
 [#Z-2constructor-06]
 == link:#Z[Z]::Z
 
@@ -249,6 +235,20 @@ Z(int value);
 | The value to construct from
 |===
 
+[#Z-2constructor-05]
+== link:#Z[Z]::Z
+
+Default constructor
+
+=== Synopsis
+
+Declared in `&lt;sort&hyphen;members&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+Z();
+----
+
 [#Z-2destructor]
 == link:#Z[Z]::&#126;Z
 
diff --git a/test-files/golden-tests/config/sort/sort-members.html b/test-files/golden-tests/config/sort/sort-members.html
index d2563ae5a..28b01c5d0 100644
--- a/test-files/golden-tests/config/sort/sort-members.html
+++ b/test-files/golden-tests/config/sort/sort-members.html
@@ -246,13 +246,6 @@ <h2 id="Z-2constructor-00"><a href="#Z-2constructor-00">Z::Z</a></h2>
 <h3>Synopses</h3>
 <div>
 Declared in <code>&lt;sort-members.cpp&gt;</code></div>
-<span>Default constructor</span>
-<pre>
-<code class="source-code cpp"><a href="#Z-2constructor-05">Z</a>();
-
-</code>
-</pre><span class="small"><a href="#Z-2constructor-05"><em>» more...</em></a></span>
-
 <span>Construct from <code>int</code></span>
 <pre>
 <code class="source-code cpp"><a href="#Z-2constructor-06">Z</a>(int value);
@@ -260,26 +253,14 @@ <h3>Synopses</h3>
 </code>
 </pre><span class="small"><a href="#Z-2constructor-06"><em>» more...</em></a></span>
 
-
-</div>
-</div>
-<div>
-<div>
-<h2 id="Z-2constructor-05"><a href="#Z-2constructor-05">Z::Z</a></h2>
-<div>
 <span>Default constructor</span>
-
-</div>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;sort-members.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp">Z();
+<code class="source-code cpp"><a href="#Z-2constructor-05">Z</a>();
 
 </code>
-</pre>
+</pre><span class="small"><a href="#Z-2constructor-05"><em>» more...</em></a></span>
+
+
 </div>
 </div>
 <div>
@@ -320,6 +301,25 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
+<h2 id="Z-2constructor-05"><a href="#Z-2constructor-05">Z::Z</a></h2>
+<div>
+<span>Default constructor</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;sort-members.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">Z();
+
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
 <h2 id="Z-2destructor"><a href="#Z-2destructor">Z::~Z</a></h2>
 <div>
 <span>Destructor</span>
diff --git a/test-files/golden-tests/config/sort/sort-members.xml b/test-files/golden-tests/config/sort/sort-members.xml
index 143cabb54..54b340ae9 100644
--- a/test-files/golden-tests/config/sort/sort-members.xml
+++ b/test-files/golden-tests/config/sort/sort-members.xml
@@ -52,14 +52,6 @@
   </struct>
   <struct name="Z" id="NQ8uQgTcafPcttyBMHHLHAXA4MA=">
     <file short-path="sort-members.cpp" source-path="sort-members.cpp" line="23" class="def"/>
-    <function class="constructor" name="Z" id="WltomC+2IcmzMN0COGL0OWWmbZk=">
-      <file short-path="sort-members.cpp" source-path="sort-members.cpp" line="32"/>
-      <doc>
-        <brief>
-          <text>Default constructor</text>
-        </brief>
-      </doc>
-    </function>
     <function class="constructor" name="Z" id="aQWtFVa4Xa+eceLXiLW74q44JRk=">
       <file short-path="sort-members.cpp" source-path="sort-members.cpp" line="31"/>
       <param name="value">
@@ -75,6 +67,14 @@
         </param>
       </doc>
     </function>
+    <function class="constructor" name="Z" id="WltomC+2IcmzMN0COGL0OWWmbZk=">
+      <file short-path="sort-members.cpp" source-path="sort-members.cpp" line="32"/>
+      <doc>
+        <brief>
+          <text>Default constructor</text>
+        </brief>
+      </doc>
+    </function>
     <function class="destructor" name="~Z" id="HMG56OCQ5OpB2E9hu4bG3/hoOho=">
       <file short-path="sort-members.cpp" source-path="sort-members.cpp" line="30"/>
       <doc>
diff --git a/test-files/golden-tests/config/sort/unordered.adoc b/test-files/golden-tests/config/sort/unordered.adoc
index f615bc695..0cc3dd580 100644
--- a/test-files/golden-tests/config/sort/unordered.adoc
+++ b/test-files/golden-tests/config/sort/unordered.adoc
@@ -342,16 +342,6 @@ Constructors
 
 Declared in `&lt;unordered&period;cpp&gt;`
 
-Default constructor
-
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-link:#Z-2constructor-05[Z]();
-----
-
-[.small]#link:#Z-2constructor-05[_» more&period;&period;&period;_]#
-
 Construct from `int`
 
 
@@ -362,20 +352,16 @@ link:#Z-2constructor-06[Z](int value);
 
 [.small]#link:#Z-2constructor-06[_» more&period;&period;&period;_]#
 
-[#Z-2constructor-05]
-== link:#Z[Z]::Z
-
 Default constructor
 
-=== Synopsis
-
-Declared in `&lt;unordered&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-Z();
+link:#Z-2constructor-05[Z]();
 ----
 
+[.small]#link:#Z-2constructor-05[_» more&period;&period;&period;_]#
+
 [#Z-2constructor-06]
 == link:#Z[Z]::Z
 
@@ -400,6 +386,20 @@ Z(int value);
 | The value to construct from
 |===
 
+[#Z-2constructor-05]
+== link:#Z[Z]::Z
+
+Default constructor
+
+=== Synopsis
+
+Declared in `&lt;unordered&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+Z();
+----
+
 [#operator_not_eq]
 == operator!&equals;
 
diff --git a/test-files/golden-tests/config/sort/unordered.html b/test-files/golden-tests/config/sort/unordered.html
index 6dc210a0f..62830da1e 100644
--- a/test-files/golden-tests/config/sort/unordered.html
+++ b/test-files/golden-tests/config/sort/unordered.html
@@ -451,13 +451,6 @@ <h2 id="Z-2constructor-00"><a href="#Z-2constructor-00">Z::Z</a></h2>
 <h3>Synopses</h3>
 <div>
 Declared in <code>&lt;unordered.cpp&gt;</code></div>
-<span>Default constructor</span>
-<pre>
-<code class="source-code cpp"><a href="#Z-2constructor-05">Z</a>();
-
-</code>
-</pre><span class="small"><a href="#Z-2constructor-05"><em>» more...</em></a></span>
-
 <span>Construct from <code>int</code></span>
 <pre>
 <code class="source-code cpp"><a href="#Z-2constructor-06">Z</a>(int value);
@@ -465,26 +458,14 @@ <h3>Synopses</h3>
 </code>
 </pre><span class="small"><a href="#Z-2constructor-06"><em>» more...</em></a></span>
 
-
-</div>
-</div>
-<div>
-<div>
-<h2 id="Z-2constructor-05"><a href="#Z-2constructor-05">Z::Z</a></h2>
-<div>
 <span>Default constructor</span>
-
-</div>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;unordered.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp">Z();
+<code class="source-code cpp"><a href="#Z-2constructor-05">Z</a>();
 
 </code>
-</pre>
+</pre><span class="small"><a href="#Z-2constructor-05"><em>» more...</em></a></span>
+
+
 </div>
 </div>
 <div>
@@ -525,6 +506,25 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
+<h2 id="Z-2constructor-05"><a href="#Z-2constructor-05">Z::Z</a></h2>
+<div>
+<span>Default constructor</span>
+
+</div>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;unordered.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">Z();
+
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
 <h2 id="operator_not_eq"><a href="#operator_not_eq">operator!&#x3D;</a></h2>
 <div>
 <span>Inequality operator</span>
diff --git a/test-files/golden-tests/config/sort/unordered.xml b/test-files/golden-tests/config/sort/unordered.xml
index 1715fe9d1..0657884e7 100644
--- a/test-files/golden-tests/config/sort/unordered.xml
+++ b/test-files/golden-tests/config/sort/unordered.xml
@@ -179,14 +179,6 @@
         </brief>
       </doc>
     </function>
-    <function class="constructor" name="Z" id="WltomC+2IcmzMN0COGL0OWWmbZk=">
-      <file short-path="unordered.cpp" source-path="unordered.cpp" line="32"/>
-      <doc>
-        <brief>
-          <text>Default constructor</text>
-        </brief>
-      </doc>
-    </function>
     <function class="constructor" name="Z" id="aQWtFVa4Xa+eceLXiLW74q44JRk=">
       <file short-path="unordered.cpp" source-path="unordered.cpp" line="31"/>
       <param name="value">
@@ -202,6 +194,14 @@
         </param>
       </doc>
     </function>
+    <function class="constructor" name="Z" id="WltomC+2IcmzMN0COGL0OWWmbZk=">
+      <file short-path="unordered.cpp" source-path="unordered.cpp" line="32"/>
+      <doc>
+        <brief>
+          <text>Default constructor</text>
+        </brief>
+      </doc>
+    </function>
   </struct>
   <function name="operator!=" id="4MuN1V3fHVfOMvtg2LT+QVm/XmE=">
     <file short-path="unordered.cpp" source-path="unordered.cpp" line="35"/>
diff --git a/test-files/golden-tests/core/libcxx.cpp b/test-files/golden-tests/core/libcxx.cpp
deleted file mode 100644
index 714a9d823..000000000
--- a/test-files/golden-tests/core/libcxx.cpp
+++ /dev/null
@@ -1,152 +0,0 @@
-// Check if all std includes are functional with -nostdinc
-// defined in MrDocsCompilationDatabase.cpp and headers/libc-stubs
-
-// libcxx
-#include <algorithm>
-#include <any>
-#include <array>
-#include <atomic>
-#include <barrier>
-#include <bit>
-#include <bitset>
-#include <cassert>
-#include <ccomplex>
-#include <cctype>
-#include <cerrno>
-#include <cfenv>
-#include <cfloat>
-#include <charconv>
-#include <chrono>
-#include <cinttypes>
-#include <ciso646>
-#include <climits>
-#include <clocale>
-#include <cmath>
-#include <codecvt>
-#include <compare>
-#include <complex>
-#include <complex.h>
-#include <concepts>
-#include <condition_variable>
-#include <coroutine>
-#include <csetjmp>
-#include <csignal>
-#include <cstdalign>
-#include <cstdarg>
-#include <cstdbool>
-#include <cstddef>
-#include <cstdint>
-#include <cstdio>
-#include <cstdlib>
-#include <cstring>
-#include <ctgmath>
-#include <ctime>
-#include <ctype.h>
-#include <cuchar>
-#include <cwchar>
-#include <cwctype>
-#include <deque>
-#include <errno.h>
-#include <exception>
-#include <execution>
-#include <expected>
-#include <experimental/iterator>
-#include <experimental/memory>
-#include <experimental/propagate_const>
-#include <experimental/simd>
-#include <experimental/type_traits>
-#include <experimental/utility>
-#include <ext/hash_map>
-#include <ext/hash_set>
-#include <fenv.h>
-#include <filesystem>
-#include <flat_map>
-#include <float.h>
-#include <format>
-#include <forward_list>
-#include <fstream>
-#include <functional>
-#include <future>
-#include <initializer_list>
-#include <inttypes.h>
-#include <iomanip>
-#include <ios>
-#include <iosfwd>
-#include <iostream>
-#include <istream>
-#include <iterator>
-#include <latch>
-#include <limits>
-#include <list>
-#include <locale>
-#include <map>
-#include <math.h>
-#include <mdspan>
-#include <memory>
-#include <memory_resource>
-#include <mutex>
-#include <new>
-#include <numbers>
-#include <numeric>
-#include <optional>
-#include <ostream>
-#include <print>
-#include <queue>
-#include <random>
-#include <ranges>
-#include <ratio>
-#include <regex>
-#include <scoped_allocator>
-#include <semaphore>
-#include <set>
-#include <shared_mutex>
-#include <source_location>
-#include <span>
-#include <sstream>
-#include <stack>
-#include <stdatomic.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdexcept>
-#include <stdio.h>
-#include <stdlib.h>
-#include <stop_token>
-#include <streambuf>
-#include <string>
-#include <string.h>
-#include <string_view>
-#include <strstream>
-#include <syncstream>
-#include <system_error>
-#include <tgmath.h>
-#include <thread>
-#include <tuple>
-#include <type_traits>
-#include <typeindex>
-#include <typeinfo>
-#include <uchar.h>
-#include <unordered_map>
-#include <unordered_set>
-#include <utility>
-#include <valarray>
-#include <variant>
-#include <vector>
-#include <version>
-#include <wchar.h>
-#include <wctype.h>
-
-/** Computes the square root of an integral value.
-
-    This function calculates the square root of a
-    given integral value using bit manipulation.
-
-    @throws std::invalid_argument if the input value is negative.
-
-    @tparam T The type of the input value. Must be an integral type.
-    @param value The integral value to compute the square root of.
-    @return The square root of the input value.
- */
-template <typename T>
-std::enable_if_t<std::is_integral_v<T>, T>
-sqrt(T value);
-
diff --git a/test-files/golden-tests/javadoc/copydoc/operator-param.adoc b/test-files/golden-tests/javadoc/copydoc/operator-param.adoc
index dd7aab791..50b355d76 100644
--- a/test-files/golden-tests/javadoc/copydoc/operator-param.adoc
+++ b/test-files/golden-tests/javadoc/copydoc/operator-param.adoc
@@ -50,10 +50,10 @@ Return true if ch is in the character set&period;
 ----
 constexpr
 bool
-link:#A-operator_call-0f[operator()](char ch) const noexcept;
+link:#A-operator_call-0b[operator()](unsigned char ch) const noexcept;
 ----
 
-[.small]#link:#A-operator_call-0f[_» more&period;&period;&period;_]#
+[.small]#link:#A-operator_call-0b[_» more&period;&period;&period;_]#
 
 Return true if ch is in the character set&period;
 
@@ -62,10 +62,10 @@ Return true if ch is in the character set&period;
 ----
 constexpr
 bool
-link:#A-operator_call-0b[operator()](unsigned char ch) const noexcept;
+link:#A-operator_call-0f[operator()](char ch) const noexcept;
 ----
 
-[.small]#link:#A-operator_call-0b[_» more&period;&period;&period;_]#
+[.small]#link:#A-operator_call-0f[_» more&period;&period;&period;_]#
 
 === Return Value
 
@@ -78,10 +78,10 @@ True if ch is in the set, otherwise false&period;
 | Name
 | Description
 | *ch*
-| The signed character to test&period;
+| The unsigned character to test&period;
 |===
 
-[#A-operator_call-0f]
+[#A-operator_call-0b]
 == link:#A[A]::operator()
 
 Return true if ch is in the character set&period;
@@ -94,7 +94,7 @@ Declared in `&lt;operator&hyphen;param&period;cpp&gt;`
 ----
 constexpr
 bool
-operator()(char ch) const noexcept;
+operator()(unsigned char ch) const noexcept;
 ----
 
 === Description
@@ -112,10 +112,10 @@ True if ch is in the set, otherwise false&period;
 | Name
 | Description
 | *ch*
-| The signed character to test&period;
+| The unsigned character to test&period;
 |===
 
-[#A-operator_call-0b]
+[#A-operator_call-0f]
 == link:#A[A]::operator()
 
 Return true if ch is in the character set&period;
@@ -128,7 +128,7 @@ Declared in `&lt;operator&hyphen;param&period;cpp&gt;`
 ----
 constexpr
 bool
-operator()(unsigned char ch) const noexcept;
+operator()(char ch) const noexcept;
 ----
 
 === Description
@@ -146,7 +146,7 @@ True if ch is in the set, otherwise false&period;
 | Name
 | Description
 | *ch*
-| The unsigned character to test&period;
+| The signed character to test&period;
 |===
 
 
diff --git a/test-files/golden-tests/javadoc/copydoc/operator-param.html b/test-files/golden-tests/javadoc/copydoc/operator-param.html
index 69beb6df7..666f990e1 100644
--- a/test-files/golden-tests/javadoc/copydoc/operator-param.html
+++ b/test-files/golden-tests/javadoc/copydoc/operator-param.html
@@ -70,19 +70,19 @@ <h3>Synopses</h3>
 <pre>
 <code class="source-code cpp">constexpr
 bool
-<a href="#A-operator_call-0f">operator()</a>(char ch) const noexcept;
+<a href="#A-operator_call-0b">operator()</a>(unsigned char ch) const noexcept;
 
 </code>
-</pre><span class="small"><a href="#A-operator_call-0f"><em>» more...</em></a></span>
+</pre><span class="small"><a href="#A-operator_call-0b"><em>» more...</em></a></span>
 
 <span>Return true if ch is in the character set.</span>
 <pre>
 <code class="source-code cpp">constexpr
 bool
-<a href="#A-operator_call-0b">operator()</a>(unsigned char ch) const noexcept;
+<a href="#A-operator_call-0f">operator()</a>(char ch) const noexcept;
 
 </code>
-</pre><span class="small"><a href="#A-operator_call-0b"><em>» more...</em></a></span>
+</pre><span class="small"><a href="#A-operator_call-0f"><em>» more...</em></a></span>
 
 
 </div>
@@ -102,7 +102,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>ch</strong></td>
-<td><span>The signed character to test.</span></td>
+<td><span>The unsigned character to test.</span></td>
 </tr>
 </tbody>
 </table>
@@ -110,7 +110,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-operator_call-0f"><a href="#A-operator_call-0f">A::operator()</a></h2>
+<h2 id="A-operator_call-0b"><a href="#A-operator_call-0b">A::operator()</a></h2>
 <div>
 <span>Return true if ch is in the character set.</span>
 
@@ -123,7 +123,7 @@ <h3>Synopsis</h3>
 <pre>
 <code class="source-code cpp">constexpr
 bool
-operator()(char ch) const noexcept;
+operator()(unsigned char ch) const noexcept;
 
 </code>
 </pre>
@@ -148,7 +148,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>ch</strong></td>
-<td><span>The signed character to test.</span></td>
+<td><span>The unsigned character to test.</span></td>
 </tr>
 </tbody>
 </table>
@@ -156,7 +156,7 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-operator_call-0b"><a href="#A-operator_call-0b">A::operator()</a></h2>
+<h2 id="A-operator_call-0f"><a href="#A-operator_call-0f">A::operator()</a></h2>
 <div>
 <span>Return true if ch is in the character set.</span>
 
@@ -169,7 +169,7 @@ <h3>Synopsis</h3>
 <pre>
 <code class="source-code cpp">constexpr
 bool
-operator()(unsigned char ch) const noexcept;
+operator()(char ch) const noexcept;
 
 </code>
 </pre>
@@ -194,7 +194,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>ch</strong></td>
-<td><span>The unsigned character to test.</span></td>
+<td><span>The signed character to test.</span></td>
 </tr>
 </tbody>
 </table>
diff --git a/test-files/golden-tests/javadoc/copydoc/operator-param.xml b/test-files/golden-tests/javadoc/copydoc/operator-param.xml
index 742d01c42..4affc9392 100644
--- a/test-files/golden-tests/javadoc/copydoc/operator-param.xml
+++ b/test-files/golden-tests/javadoc/copydoc/operator-param.xml
@@ -4,8 +4,8 @@
 <namespace id="//////////////////////////8=">
   <struct name="A" id="YrPSaKAbmXgzCAX5WByx4eVoqBM=">
     <file short-path="operator-param.cpp" source-path="operator-param.cpp" line="1" class="def"/>
-    <function name="operator()" exception-spec="noexcept" id="+yVVNLbCaXDXfZPFoKE5xv2xPZQ=">
-      <file short-path="operator-param.cpp" source-path="operator-param.cpp" line="23"/>
+    <function name="operator()" exception-spec="noexcept" id="tslXb2aqh8tYThe+A16a9felw5M=">
+      <file short-path="operator-param.cpp" source-path="operator-param.cpp" line="12"/>
       <attr id="constexpr-kind" name="constexpr" value="1"/>
       <attr id="operator" name="call" value="42"/>
       <attr id="is-const"/>
@@ -13,7 +13,7 @@
         <type name="bool"/>
       </return>
       <param name="ch">
-        <type name="char"/>
+        <type name="unsigned char"/>
       </param>
       <doc>
         <brief>
@@ -26,12 +26,12 @@
           <text>True if ch is in the set, otherwise false.</text>
         </returns>
         <param name="ch">
-          <text>The signed character to test.</text>
+          <text>The unsigned character to test.</text>
         </param>
       </doc>
     </function>
-    <function name="operator()" exception-spec="noexcept" id="tslXb2aqh8tYThe+A16a9felw5M=">
-      <file short-path="operator-param.cpp" source-path="operator-param.cpp" line="12"/>
+    <function name="operator()" exception-spec="noexcept" id="+yVVNLbCaXDXfZPFoKE5xv2xPZQ=">
+      <file short-path="operator-param.cpp" source-path="operator-param.cpp" line="23"/>
       <attr id="constexpr-kind" name="constexpr" value="1"/>
       <attr id="operator" name="call" value="42"/>
       <attr id="is-const"/>
@@ -39,7 +39,7 @@
         <type name="bool"/>
       </return>
       <param name="ch">
-        <type name="unsigned char"/>
+        <type name="char"/>
       </param>
       <doc>
         <brief>
@@ -52,7 +52,7 @@
           <text>True if ch is in the set, otherwise false.</text>
         </returns>
         <param name="ch">
-          <text>The unsigned character to test.</text>
+          <text>The signed character to test.</text>
         </param>
       </doc>
     </function>
diff --git a/test-files/golden-tests/javadoc/copydoc/qualified.adoc b/test-files/golden-tests/javadoc/copydoc/qualified.adoc
index 8e2497b3c..9808fbcee 100644
--- a/test-files/golden-tests/javadoc/copydoc/qualified.adoc
+++ b/test-files/golden-tests/javadoc/copydoc/qualified.adoc
@@ -427,27 +427,27 @@ Documentation for the reference function
 
 Declared in `&lt;qualified&period;cpp&gt;`
 
-Reference function
+Fail
 
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 void
-link:#N-A-g-0a[g](link:#N-A-B[B] a);
+link:#N-A-g-06c[g](int a);
 ----
 
-[.small]#link:#N-A-g-0a[_» more&period;&period;&period;_]#
+[.small]#link:#N-A-g-06c[_» more&period;&period;&period;_]#
 
-Fail
+Reference function
 
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 void
-link:#N-A-g-06c[g](int a);
+link:#N-A-g-0a[g](link:#N-A-B[B] a);
 ----
 
-[.small]#link:#N-A-g-06c[_» more&period;&period;&period;_]#
+[.small]#link:#N-A-g-0a[_» more&period;&period;&period;_]#
 
 === Parameters
 
@@ -456,13 +456,13 @@ link:#N-A-g-06c[g](int a);
 | Name
 | Description
 | *a*
-| Qualified param
+| Fundamental type parameter
 |===
 
-[#N-A-g-0a]
+[#N-A-g-06c]
 == link:#N[N]::link:#N-A[A]::g
 
-Reference function
+Fail
 
 === Synopsis
 
@@ -471,12 +471,12 @@ Declared in `&lt;qualified&period;cpp&gt;`
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 void
-g(link:#N-A-B[B] a);
+g(int a);
 ----
 
 === Description
 
-Documentation for the reference function
+Function with same number of parameters but different types&period; This should fail&period;
 
 === Parameters
 
@@ -485,13 +485,13 @@ Documentation for the reference function
 | Name
 | Description
 | *a*
-| Qualified param
+| Fundamental type parameter
 |===
 
-[#N-A-g-06c]
+[#N-A-g-0a]
 == link:#N[N]::link:#N-A[A]::g
 
-Fail
+Reference function
 
 === Synopsis
 
@@ -500,12 +500,12 @@ Declared in `&lt;qualified&period;cpp&gt;`
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 void
-g(int a);
+g(link:#N-A-B[B] a);
 ----
 
 === Description
 
-Function with same number of parameters but different types&period; This should fail&period;
+Documentation for the reference function
 
 === Parameters
 
@@ -514,7 +514,7 @@ Function with same number of parameters but different types&period; This should
 | Name
 | Description
 | *a*
-| Fundamental type parameter
+| Qualified param
 |===
 
 [#N-A-h-05]
@@ -526,27 +526,27 @@ Function with same number of parameters but different types&period; This should
 
 Declared in `&lt;qualified&period;cpp&gt;`
 
-Reference function
+Fail
 
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 void
-link:#N-A-h-0f[h](link:#N-A-B[N::A::B] a);
+link:#N-A-h-06[h](int a);
 ----
 
-[.small]#link:#N-A-h-0f[_» more&period;&period;&period;_]#
+[.small]#link:#N-A-h-06[_» more&period;&period;&period;_]#
 
-Fail
+Reference function
 
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 void
-link:#N-A-h-06[h](int a);
+link:#N-A-h-0f[h](link:#N-A-B[N::A::B] a);
 ----
 
-[.small]#link:#N-A-h-06[_» more&period;&period;&period;_]#
+[.small]#link:#N-A-h-0f[_» more&period;&period;&period;_]#
 
 === Parameters
 
@@ -555,13 +555,13 @@ link:#N-A-h-06[h](int a);
 | Name
 | Description
 | *a*
-| Qualified param
+| Fundamental type parameter
 |===
 
-[#N-A-h-0f]
+[#N-A-h-06]
 == link:#N[N]::link:#N-A[A]::h
 
-Reference function
+Fail
 
 === Synopsis
 
@@ -570,12 +570,12 @@ Declared in `&lt;qualified&period;cpp&gt;`
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 void
-h(link:#N-A-B[N::A::B] a);
+h(int a);
 ----
 
 === Description
 
-Documentation for the reference function
+Function with same number of parameters but different types&period; This should fail&period;
 
 === Parameters
 
@@ -584,13 +584,13 @@ Documentation for the reference function
 | Name
 | Description
 | *a*
-| Qualified param
+| Fundamental type parameter
 |===
 
-[#N-A-h-06]
+[#N-A-h-0f]
 == link:#N[N]::link:#N-A[A]::h
 
-Fail
+Reference function
 
 === Synopsis
 
@@ -599,12 +599,12 @@ Declared in `&lt;qualified&period;cpp&gt;`
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 void
-h(int a);
+h(link:#N-A-B[N::A::B] a);
 ----
 
 === Description
 
-Function with same number of parameters but different types&period; This should fail&period;
+Documentation for the reference function
 
 === Parameters
 
@@ -613,7 +613,7 @@ Function with same number of parameters but different types&period; This should
 | Name
 | Description
 | *a*
-| Fundamental type parameter
+| Qualified param
 |===
 
 [#param_t]
diff --git a/test-files/golden-tests/javadoc/copydoc/qualified.html b/test-files/golden-tests/javadoc/copydoc/qualified.html
index 9765eeece..1cf6bf204 100644
--- a/test-files/golden-tests/javadoc/copydoc/qualified.html
+++ b/test-files/golden-tests/javadoc/copydoc/qualified.html
@@ -554,21 +554,21 @@ <h2 id="N-A-g-06e"><a href="#N-A-g-06e">N::A::g</a></h2>
 <h3>Synopses</h3>
 <div>
 Declared in <code>&lt;qualified.cpp&gt;</code></div>
-<span>Reference function</span>
+<span>Fail</span>
 <pre>
 <code class="source-code cpp">void
-<a href="#N-A-g-0a">g</a>(<a href="#N-A-B">B</a> a);
+<a href="#N-A-g-06c">g</a>(int a);
 
 </code>
-</pre><span class="small"><a href="#N-A-g-0a"><em>» more...</em></a></span>
+</pre><span class="small"><a href="#N-A-g-06c"><em>» more...</em></a></span>
 
-<span>Fail</span>
+<span>Reference function</span>
 <pre>
 <code class="source-code cpp">void
-<a href="#N-A-g-06c">g</a>(int a);
+<a href="#N-A-g-0a">g</a>(<a href="#N-A-B">B</a> a);
 
 </code>
-</pre><span class="small"><a href="#N-A-g-06c"><em>» more...</em></a></span>
+</pre><span class="small"><a href="#N-A-g-0a"><em>» more...</em></a></span>
 
 
 </div>
@@ -584,7 +584,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>a</strong></td>
-<td><span>Qualified param</span></td>
+<td><span>Fundamental type parameter</span></td>
 </tr>
 </tbody>
 </table>
@@ -592,9 +592,9 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-g-0a"><a href="#N-A-g-0a">N::A::g</a></h2>
+<h2 id="N-A-g-06c"><a href="#N-A-g-06c">N::A::g</a></h2>
 <div>
-<span>Reference function</span>
+<span>Fail</span>
 
 </div>
 </div>
@@ -604,14 +604,14 @@ <h3>Synopsis</h3>
 Declared in <code>&lt;qualified.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">void
-g(<a href="#N-A-B">B</a> a);
+g(int a);
 
 </code>
 </pre>
 </div>
 <div>
 <h3>Description</h3>
-<p>Documentation for the reference function</p>
+<p>Function with same number of parameters but different types. This should fail.</p>
 </div>
 <div>
 <h3>Parameters</h3>
@@ -625,7 +625,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>a</strong></td>
-<td><span>Qualified param</span></td>
+<td><span>Fundamental type parameter</span></td>
 </tr>
 </tbody>
 </table>
@@ -633,9 +633,9 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-g-06c"><a href="#N-A-g-06c">N::A::g</a></h2>
+<h2 id="N-A-g-0a"><a href="#N-A-g-0a">N::A::g</a></h2>
 <div>
-<span>Fail</span>
+<span>Reference function</span>
 
 </div>
 </div>
@@ -645,14 +645,14 @@ <h3>Synopsis</h3>
 Declared in <code>&lt;qualified.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">void
-g(int a);
+g(<a href="#N-A-B">B</a> a);
 
 </code>
 </pre>
 </div>
 <div>
 <h3>Description</h3>
-<p>Function with same number of parameters but different types. This should fail.</p>
+<p>Documentation for the reference function</p>
 </div>
 <div>
 <h3>Parameters</h3>
@@ -666,7 +666,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>a</strong></td>
-<td><span>Fundamental type parameter</span></td>
+<td><span>Qualified param</span></td>
 </tr>
 </tbody>
 </table>
@@ -684,21 +684,21 @@ <h2 id="N-A-h-05"><a href="#N-A-h-05">N::A::h</a></h2>
 <h3>Synopses</h3>
 <div>
 Declared in <code>&lt;qualified.cpp&gt;</code></div>
-<span>Reference function</span>
+<span>Fail</span>
 <pre>
 <code class="source-code cpp">void
-<a href="#N-A-h-0f">h</a>(<a href="#N-A-B">N::A::B</a> a);
+<a href="#N-A-h-06">h</a>(int a);
 
 </code>
-</pre><span class="small"><a href="#N-A-h-0f"><em>» more...</em></a></span>
+</pre><span class="small"><a href="#N-A-h-06"><em>» more...</em></a></span>
 
-<span>Fail</span>
+<span>Reference function</span>
 <pre>
 <code class="source-code cpp">void
-<a href="#N-A-h-06">h</a>(int a);
+<a href="#N-A-h-0f">h</a>(<a href="#N-A-B">N::A::B</a> a);
 
 </code>
-</pre><span class="small"><a href="#N-A-h-06"><em>» more...</em></a></span>
+</pre><span class="small"><a href="#N-A-h-0f"><em>» more...</em></a></span>
 
 
 </div>
@@ -714,7 +714,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>a</strong></td>
-<td><span>Qualified param</span></td>
+<td><span>Fundamental type parameter</span></td>
 </tr>
 </tbody>
 </table>
@@ -722,9 +722,9 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-h-0f"><a href="#N-A-h-0f">N::A::h</a></h2>
+<h2 id="N-A-h-06"><a href="#N-A-h-06">N::A::h</a></h2>
 <div>
-<span>Reference function</span>
+<span>Fail</span>
 
 </div>
 </div>
@@ -734,14 +734,14 @@ <h3>Synopsis</h3>
 Declared in <code>&lt;qualified.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">void
-h(<a href="#N-A-B">N::A::B</a> a);
+h(int a);
 
 </code>
 </pre>
 </div>
 <div>
 <h3>Description</h3>
-<p>Documentation for the reference function</p>
+<p>Function with same number of parameters but different types. This should fail.</p>
 </div>
 <div>
 <h3>Parameters</h3>
@@ -755,7 +755,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>a</strong></td>
-<td><span>Qualified param</span></td>
+<td><span>Fundamental type parameter</span></td>
 </tr>
 </tbody>
 </table>
@@ -763,9 +763,9 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="N-A-h-06"><a href="#N-A-h-06">N::A::h</a></h2>
+<h2 id="N-A-h-0f"><a href="#N-A-h-0f">N::A::h</a></h2>
 <div>
-<span>Fail</span>
+<span>Reference function</span>
 
 </div>
 </div>
@@ -775,14 +775,14 @@ <h3>Synopsis</h3>
 Declared in <code>&lt;qualified.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp">void
-h(int a);
+h(<a href="#N-A-B">N::A::B</a> a);
 
 </code>
 </pre>
 </div>
 <div>
 <h3>Description</h3>
-<p>Function with same number of parameters but different types. This should fail.</p>
+<p>Documentation for the reference function</p>
 </div>
 <div>
 <h3>Parameters</h3>
@@ -796,7 +796,7 @@ <h3>Parameters</h3>
 <tbody>
 <tr>
 <td><strong>a</strong></td>
-<td><span>Fundamental type parameter</span></td>
+<td><span>Qualified param</span></td>
 </tr>
 </tbody>
 </table>
diff --git a/test-files/golden-tests/javadoc/copydoc/qualified.xml b/test-files/golden-tests/javadoc/copydoc/qualified.xml
index 3ab2d360a..6f94dd637 100644
--- a/test-files/golden-tests/javadoc/copydoc/qualified.xml
+++ b/test-files/golden-tests/javadoc/copydoc/qualified.xml
@@ -144,6 +144,23 @@
           </param>
         </doc>
       </function>
+      <function name="g" id="bDQUNJ3SHpCjwF8zCqo7Jw8Cjic=">
+        <file short-path="qualified.cpp" source-path="qualified.cpp" line="16"/>
+        <param name="a">
+          <type name="int"/>
+        </param>
+        <doc>
+          <brief>
+            <text>Fail</text>
+          </brief>
+          <para>
+            <text>Function with same number of parameters but different types. This should fail.</text>
+          </para>
+          <param name="a">
+            <text>Fundamental type parameter</text>
+          </param>
+        </doc>
+      </function>
       <function name="g" id="pkByPldRuMDs8h9fkQnHTrf/rxM=">
         <file short-path="qualified.cpp" source-path="qualified.cpp" line="24"/>
         <param name="a">
@@ -161,8 +178,8 @@
           </param>
         </doc>
       </function>
-      <function name="g" id="bDQUNJ3SHpCjwF8zCqo7Jw8Cjic=">
-        <file short-path="qualified.cpp" source-path="qualified.cpp" line="16"/>
+      <function name="h" id="aEsACCmKRAV5MPYavFglHXgugn0=">
+        <file short-path="qualified.cpp" source-path="qualified.cpp" line="45"/>
         <param name="a">
           <type name="int"/>
         </param>
@@ -195,23 +212,6 @@
           </param>
         </doc>
       </function>
-      <function name="h" id="aEsACCmKRAV5MPYavFglHXgugn0=">
-        <file short-path="qualified.cpp" source-path="qualified.cpp" line="45"/>
-        <param name="a">
-          <type name="int"/>
-        </param>
-        <doc>
-          <brief>
-            <text>Fail</text>
-          </brief>
-          <para>
-            <text>Function with same number of parameters but different types. This should fail.</text>
-          </para>
-          <param name="a">
-            <text>Fundamental type parameter</text>
-          </param>
-        </doc>
-      </function>
     </struct>
   </namespace>
   <template>
diff --git a/test-files/golden-tests/symbols/function/sfinae.xml b/test-files/golden-tests/symbols/function/sfinae.xml
index f700f559b..c3b14913c 100644
--- a/test-files/golden-tests/symbols/function/sfinae.xml
+++ b/test-files/golden-tests/symbols/function/sfinae.xml
@@ -119,7 +119,7 @@
   </template>
   <template>
     <tparam name="T" class="type"/>
-    <function name="f2" requires="std::is_integral_v&lt;T&gt;" id="7RxfINQ5PQyMFT7lVKhcQZiocmU=">
+    <function name="f2" requires="std::is_integral_v&lt;T&gt;" id="bn9i0jLY62v3jkqXCCzEQEMmkdA=">
       <file short-path="sfinae.cpp" source-path="sfinae.cpp" line="10"/>
       <return>
         <type name="int"/>
@@ -207,7 +207,7 @@
   </template>
   <template requires="std::is_integral_v&lt;T&gt;">
     <tparam name="T" class="type"/>
-    <function name="f7" id="5j4YKg9GCIyC/kpDPExDouNRI8E=">
+    <function name="f7" id="AnVHMfJmNqT7yg9ab0pk7mHPses=">
       <file short-path="sfinae.cpp" source-path="sfinae.cpp" line="39"/>
       <param name="value">
         <type name="T"/>
diff --git a/test-files/golden-tests/symbols/overloads/overloads-brief.adoc b/test-files/golden-tests/symbols/overloads/overloads-brief.adoc
index cff108b02..b38fd4af9 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-brief.adoc
+++ b/test-files/golden-tests/symbols/overloads/overloads-brief.adoc
@@ -259,27 +259,27 @@ Addition operators
 
 Declared in `&lt;overloads&hyphen;brief&period;cpp&gt;`
 
-Addition operator for ints
+Addition operator for As
 
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 link:#A[A]
-link:#A-operator_plus-0c[operator&plus;](int a);
+link:#A-operator_plus-0e[operator&plus;](link:#A[A] const& a);
 ----
 
-[.small]#link:#A-operator_plus-0c[_» more&period;&period;&period;_]#
+[.small]#link:#A-operator_plus-0e[_» more&period;&period;&period;_]#
 
-Addition operator for As
+Addition operator for ints
 
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 link:#A[A]
-link:#A-operator_plus-0e[operator&plus;](link:#A[A] const& a);
+link:#A-operator_plus-0c[operator&plus;](int a);
 ----
 
-[.small]#link:#A-operator_plus-0e[_» more&period;&period;&period;_]#
+[.small]#link:#A-operator_plus-0c[_» more&period;&period;&period;_]#
 
 === Return Value
 
@@ -295,10 +295,10 @@ link:#A-operator_plus-0e[operator&plus;](link:#A[A] const& a);
 | Describe a
 |===
 
-[#A-operator_plus-0c]
+[#A-operator_plus-0e]
 == link:#A[A]::operator&plus;
 
-Addition operator for ints
+Addition operator for As
 
 === Synopsis
 
@@ -307,7 +307,7 @@ Declared in `&lt;overloads&hyphen;brief&period;cpp&gt;`
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 link:#A[A]
-operator&plus;(int a);
+operator&plus;(link:#A[A] const& a);
 ----
 
 === Return Value
@@ -324,10 +324,10 @@ operator&plus;(int a);
 | Describe a
 |===
 
-[#A-operator_plus-0e]
+[#A-operator_plus-0c]
 == link:#A[A]::operator&plus;
 
-Addition operator for As
+Addition operator for ints
 
 === Synopsis
 
@@ -336,7 +336,7 @@ Declared in `&lt;overloads&hyphen;brief&period;cpp&gt;`
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
 link:#A[A]
-operator&plus;(link:#A[A] const& a);
+operator&plus;(int a);
 ----
 
 === Return Value
diff --git a/test-files/golden-tests/symbols/overloads/overloads-brief.html b/test-files/golden-tests/symbols/overloads/overloads-brief.html
index ea857a675..7e88d7a08 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-brief.html
+++ b/test-files/golden-tests/symbols/overloads/overloads-brief.html
@@ -340,21 +340,21 @@ <h2 id="A-operator_plus-00"><a href="#A-operator_plus-00">A::operator+</a></h2>
 <h3>Synopses</h3>
 <div>
 Declared in <code>&lt;overloads-brief.cpp&gt;</code></div>
-<span>Addition operator for ints</span>
+<span>Addition operator for As</span>
 <pre>
 <code class="source-code cpp"><a href="#A">A</a>
-<a href="#A-operator_plus-0c">operator+</a>(int a);
+<a href="#A-operator_plus-0e">operator+</a>(<a href="#A">A</a> const& a);
 
 </code>
-</pre><span class="small"><a href="#A-operator_plus-0c"><em>» more...</em></a></span>
+</pre><span class="small"><a href="#A-operator_plus-0e"><em>» more...</em></a></span>
 
-<span>Addition operator for As</span>
+<span>Addition operator for ints</span>
 <pre>
 <code class="source-code cpp"><a href="#A">A</a>
-<a href="#A-operator_plus-0e">operator+</a>(<a href="#A">A</a> const& a);
+<a href="#A-operator_plus-0c">operator+</a>(int a);
 
 </code>
-</pre><span class="small"><a href="#A-operator_plus-0e"><em>» more...</em></a></span>
+</pre><span class="small"><a href="#A-operator_plus-0c"><em>» more...</em></a></span>
 
 
 </div>
@@ -382,9 +382,9 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-operator_plus-0c"><a href="#A-operator_plus-0c">A::operator+</a></h2>
+<h2 id="A-operator_plus-0e"><a href="#A-operator_plus-0e">A::operator+</a></h2>
 <div>
-<span>Addition operator for ints</span>
+<span>Addition operator for As</span>
 
 </div>
 </div>
@@ -394,7 +394,7 @@ <h3>Synopsis</h3>
 Declared in <code>&lt;overloads-brief.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp"><a href="#A">A</a>
-operator+(int a);
+operator+(<a href="#A">A</a> const& a);
 
 </code>
 </pre>
@@ -423,9 +423,9 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-operator_plus-0e"><a href="#A-operator_plus-0e">A::operator+</a></h2>
+<h2 id="A-operator_plus-0c"><a href="#A-operator_plus-0c">A::operator+</a></h2>
 <div>
-<span>Addition operator for As</span>
+<span>Addition operator for ints</span>
 
 </div>
 </div>
@@ -435,7 +435,7 @@ <h3>Synopsis</h3>
 Declared in <code>&lt;overloads-brief.cpp&gt;</code></div>
 <pre>
 <code class="source-code cpp"><a href="#A">A</a>
-operator+(<a href="#A">A</a> const& a);
+operator+(int a);
 
 </code>
 </pre>
diff --git a/test-files/golden-tests/symbols/overloads/overloads-brief.xml b/test-files/golden-tests/symbols/overloads/overloads-brief.xml
index a9e382a8a..d1f7e58a7 100644
--- a/test-files/golden-tests/symbols/overloads/overloads-brief.xml
+++ b/test-files/golden-tests/symbols/overloads/overloads-brief.xml
@@ -82,18 +82,20 @@
         </param>
       </doc>
     </function>
-    <function name="operator+" id="ycaQWu1bpL50KsLIdks09uNq0fw=">
-      <file short-path="overloads-brief.cpp" source-path="overloads-brief.cpp" line="54"/>
+    <function name="operator+" id="4jg29DjTLdYrWC4PLhyeE68ztvQ=">
+      <file short-path="overloads-brief.cpp" source-path="overloads-brief.cpp" line="47"/>
       <attr id="operator" name="plus" value="5"/>
       <return>
         <type id="YrPSaKAbmXgzCAX5WByx4eVoqBM=" name="A"/>
       </return>
       <param name="a">
-        <type name="int"/>
+        <type class="lvalue-reference">
+          <pointee-type id="YrPSaKAbmXgzCAX5WByx4eVoqBM=" name="A" cv-qualifiers="const"/>
+        </type>
       </param>
       <doc>
         <brief>
-          <text>Addition operator for ints</text>
+          <text>Addition operator for As</text>
         </brief>
         <returns>
           <mono>*this</mono>
@@ -103,20 +105,18 @@
         </param>
       </doc>
     </function>
-    <function name="operator+" id="4jg29DjTLdYrWC4PLhyeE68ztvQ=">
-      <file short-path="overloads-brief.cpp" source-path="overloads-brief.cpp" line="47"/>
+    <function name="operator+" id="ycaQWu1bpL50KsLIdks09uNq0fw=">
+      <file short-path="overloads-brief.cpp" source-path="overloads-brief.cpp" line="54"/>
       <attr id="operator" name="plus" value="5"/>
       <return>
         <type id="YrPSaKAbmXgzCAX5WByx4eVoqBM=" name="A"/>
       </return>
       <param name="a">
-        <type class="lvalue-reference">
-          <pointee-type id="YrPSaKAbmXgzCAX5WByx4eVoqBM=" name="A" cv-qualifiers="const"/>
-        </type>
+        <type name="int"/>
       </param>
       <doc>
         <brief>
-          <text>Addition operator for As</text>
+          <text>Addition operator for ints</text>
         </brief>
         <returns>
           <mono>*this</mono>
diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-1.adoc b/test-files/golden-tests/symbols/record/class-template-specializations-1.adoc
index 06a0621bd..b36630534 100644
--- a/test-files/golden-tests/symbols/record/class-template-specializations-1.adoc
+++ b/test-files/golden-tests/symbols/record/class-template-specializations-1.adoc
@@ -2296,8 +2296,8 @@ struct link:#S0-0cf-S1-S2[S2]&lt;16&gt;;
 | Name
 | link:#S0-09e4-S1-S2-02-S3[`S3`] 
 | link:#S0-09e4-S1-S2-02-S4-00[`S4`] 
-| link:#S0-09e4-S1-S2-02-S4-02[`S4&lt;17, int*&gt;`] 
 | link:#S0-09e4-S1-S2-02-S4-07[`S4&lt;17, T*&gt;`] 
+| link:#S0-09e4-S1-S2-02-S4-02[`S4&lt;17, int*&gt;`] 
 |===
 
 === Member Functions
@@ -2345,6 +2345,19 @@ struct S4;
 | 
 |===
 
+[#S0-09e4-S1-S2-02-S4-07]
+== link:#S0-09e4[S0&lt;15&gt;]::link:#S0-09e4-S1[S1]::link:#S0-09e4-S1-S2-02[S2&lt;16&gt;]::link:#S0-0cf-S1-S2-S4[S4]&lt;17, T*&gt;
+
+=== Synopsis
+
+Declared in `&lt;class&hyphen;template&hyphen;specializations&hyphen;1&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+template&lt;typename T&gt;
+struct link:#S0-0cf-S1-S2-S4[S4]&lt;17, T*&gt;;
+----
+
 [#S0-09e4-S1-S2-02-S4-02]
 == link:#S0-09e4[S0&lt;15&gt;]::link:#S0-09e4-S1[S1]::link:#S0-09e4-S1-S2-02[S2&lt;16&gt;]::link:#S0-0cf-S1-S2-S4[S4]&lt;17, int*&gt;
 
@@ -2368,19 +2381,6 @@ struct link:#S0-0cf-S1-S2-S4[S4]&lt;17, int*&gt;;
 | 
 |===
 
-[#S0-09e4-S1-S2-02-S4-07]
-== link:#S0-09e4[S0&lt;15&gt;]::link:#S0-09e4-S1[S1]::link:#S0-09e4-S1-S2-02[S2&lt;16&gt;]::link:#S0-0cf-S1-S2-S4[S4]&lt;17, T*&gt;
-
-=== Synopsis
-
-Declared in `&lt;class&hyphen;template&hyphen;specializations&hyphen;1&period;cpp&gt;`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-template&lt;typename T&gt;
-struct link:#S0-0cf-S1-S2-S4[S4]&lt;17, T*&gt;;
-----
-
 [#S0-09e4-S1-S2-02-f2]
 == link:#S0-09e4[S0&lt;15&gt;]::link:#S0-09e4-S1[S1]::link:#S0-09e4-S1-S2-02[S2&lt;16&gt;]::f2
 
@@ -3226,8 +3226,8 @@ struct S6;
 |===
 | Name
 | link:#S0-09e2-S5-0c-S6-S7-0b[`S7`] 
-| link:#S0-09e2-S5-0c-S6-S7-0d[`S7&lt;29, int*&gt;`] 
 | link:#S0-09e2-S5-0c-S6-S7-0a[`S7&lt;29, T*&gt;`] 
+| link:#S0-09e2-S5-0c-S6-S7-0d[`S7&lt;29, int*&gt;`] 
 |===
 
 === Member Functions
@@ -3263,6 +3263,19 @@ struct S7;
 | 
 |===
 
+[#S0-09e2-S5-0c-S6-S7-0a]
+== link:#S0-09e2[S0&lt;27&gt;]::link:#S0-09e2-S5-0c[S5&lt;28&gt;]::link:#S0-09e2-S5-0c-S6[S6]::link:#S0-0cf-S5-S6-S7[S7]&lt;29, T*&gt;
+
+=== Synopsis
+
+Declared in `&lt;class&hyphen;template&hyphen;specializations&hyphen;1&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+template&lt;typename T&gt;
+struct link:#S0-0cf-S5-S6-S7[S7]&lt;29, T*&gt;;
+----
+
 [#S0-09e2-S5-0c-S6-S7-0d]
 == link:#S0-09e2[S0&lt;27&gt;]::link:#S0-09e2-S5-0c[S5&lt;28&gt;]::link:#S0-09e2-S5-0c-S6[S6]::link:#S0-0cf-S5-S6-S7[S7]&lt;29, int*&gt;
 
@@ -3286,19 +3299,6 @@ struct link:#S0-0cf-S5-S6-S7[S7]&lt;29, int*&gt;;
 | 
 |===
 
-[#S0-09e2-S5-0c-S6-S7-0a]
-== link:#S0-09e2[S0&lt;27&gt;]::link:#S0-09e2-S5-0c[S5&lt;28&gt;]::link:#S0-09e2-S5-0c-S6[S6]::link:#S0-0cf-S5-S6-S7[S7]&lt;29, T*&gt;
-
-=== Synopsis
-
-Declared in `&lt;class&hyphen;template&hyphen;specializations&hyphen;1&period;cpp&gt;`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-template&lt;typename T&gt;
-struct link:#S0-0cf-S5-S6-S7[S7]&lt;29, T*&gt;;
-----
-
 [#S0-09e2-S5-0c-S6-f6]
 == link:#S0-09e2[S0&lt;27&gt;]::link:#S0-09e2-S5-0c[S5&lt;28&gt;]::link:#S0-09e2-S5-0c-S6[S6]::f6
 
@@ -4306,8 +4306,8 @@ struct link:#S0-0cf-S5-S6-S7[S7]&lt;41&gt;;
 | Name
 | link:#S0-06-S5-07-S6-S7-0a-S8[`S8`] 
 | link:#S0-06-S5-07-S6-S7-0a-S9-05[`S9`] 
-| link:#S0-06-S5-07-S6-S7-0a-S9-08[`S9&lt;42, int*&gt;`] 
 | link:#S0-06-S5-07-S6-S7-0a-S9-00[`S9&lt;42, T*&gt;`] 
+| link:#S0-06-S5-07-S6-S7-0a-S9-08[`S9&lt;42, int*&gt;`] 
 |===
 
 === Member Functions
@@ -4355,6 +4355,19 @@ struct S9;
 | 
 |===
 
+[#S0-06-S5-07-S6-S7-0a-S9-00]
+== link:#S0-06[S0&lt;39&gt;]::link:#S0-06-S5-07[S5&lt;40&gt;]::link:#S0-06-S5-07-S6[S6]::link:#S0-06-S5-07-S6-S7-0a[S7&lt;41&gt;]::link:#S0-0cf-S5-S6-S7-S9[S9]&lt;42, T*&gt;
+
+=== Synopsis
+
+Declared in `&lt;class&hyphen;template&hyphen;specializations&hyphen;1&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+template&lt;typename T&gt;
+struct link:#S0-0cf-S5-S6-S7-S9[S9]&lt;42, T*&gt;;
+----
+
 [#S0-06-S5-07-S6-S7-0a-S9-08]
 == link:#S0-06[S0&lt;39&gt;]::link:#S0-06-S5-07[S5&lt;40&gt;]::link:#S0-06-S5-07-S6[S6]::link:#S0-06-S5-07-S6-S7-0a[S7&lt;41&gt;]::link:#S0-0cf-S5-S6-S7-S9[S9]&lt;42, int*&gt;
 
@@ -4378,19 +4391,6 @@ struct link:#S0-0cf-S5-S6-S7-S9[S9]&lt;42, int*&gt;;
 | 
 |===
 
-[#S0-06-S5-07-S6-S7-0a-S9-00]
-== link:#S0-06[S0&lt;39&gt;]::link:#S0-06-S5-07[S5&lt;40&gt;]::link:#S0-06-S5-07-S6[S6]::link:#S0-06-S5-07-S6-S7-0a[S7&lt;41&gt;]::link:#S0-0cf-S5-S6-S7-S9[S9]&lt;42, T*&gt;
-
-=== Synopsis
-
-Declared in `&lt;class&hyphen;template&hyphen;specializations&hyphen;1&period;cpp&gt;`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-template&lt;typename T&gt;
-struct link:#S0-0cf-S5-S6-S7-S9[S9]&lt;42, T*&gt;;
-----
-
 [#S0-06-S5-07-S6-S7-0a-f7]
 == link:#S0-06[S0&lt;39&gt;]::link:#S0-06-S5-07[S5&lt;40&gt;]::link:#S0-06-S5-07-S6[S6]::link:#S0-06-S5-07-S6-S7-0a[S7&lt;41&gt;]::f7
 
@@ -4893,8 +4893,8 @@ struct S1;
 |===
 | Name
 | link:#S0-07e-S1-S2-04[`S2`] 
-| link:#S0-07e-S1-S2-07[`S2&lt;7, int*&gt;`] 
 | link:#S0-07e-S1-S2-06[`S2&lt;7, T*&gt;`] 
+| link:#S0-07e-S1-S2-07[`S2&lt;7, int*&gt;`] 
 |===
 
 === Member Functions
@@ -4930,6 +4930,19 @@ struct S2;
 | 
 |===
 
+[#S0-07e-S1-S2-06]
+== link:#S0-07e[S0&lt;6&gt;]::link:#S0-07e-S1[S1]::link:#S0-0cf-S1-S2[S2]&lt;7, T*&gt;
+
+=== Synopsis
+
+Declared in `&lt;class&hyphen;template&hyphen;specializations&hyphen;1&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+template&lt;typename T&gt;
+struct link:#S0-0cf-S1-S2[S2]&lt;7, T*&gt;;
+----
+
 [#S0-07e-S1-S2-07]
 == link:#S0-07e[S0&lt;6&gt;]::link:#S0-07e-S1[S1]::link:#S0-0cf-S1-S2[S2]&lt;7, int*&gt;
 
@@ -4953,19 +4966,6 @@ struct link:#S0-0cf-S1-S2[S2]&lt;7, int*&gt;;
 | 
 |===
 
-[#S0-07e-S1-S2-06]
-== link:#S0-07e[S0&lt;6&gt;]::link:#S0-07e-S1[S1]::link:#S0-0cf-S1-S2[S2]&lt;7, T*&gt;
-
-=== Synopsis
-
-Declared in `&lt;class&hyphen;template&hyphen;specializations&hyphen;1&period;cpp&gt;`
-
-[source,cpp,subs="verbatim,replacements,macros,-callouts"]
-----
-template&lt;typename T&gt;
-struct link:#S0-0cf-S1-S2[S2]&lt;7, T*&gt;;
-----
-
 [#S0-07e-S1-f1]
 == link:#S0-07e[S0&lt;6&gt;]::link:#S0-07e-S1[S1]::f1
 
diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-1.html b/test-files/golden-tests/symbols/record/class-template-specializations-1.html
index 36044b0f7..083e6fd6c 100644
--- a/test-files/golden-tests/symbols/record/class-template-specializations-1.html
+++ b/test-files/golden-tests/symbols/record/class-template-specializations-1.html
@@ -3197,8 +3197,8 @@ <h2>Types</h2>
 <tr>
 <td><a href="#S0-09e4-S1-S2-02-S3"><code>S3</code></a> </td></tr><tr>
 <td><a href="#S0-09e4-S1-S2-02-S4-00"><code>S4</code></a> </td></tr><tr>
-<td><a href="#S0-09e4-S1-S2-02-S4-02"><code>S4&lt;17, int*&gt;</code></a> </td></tr><tr>
-<td><a href="#S0-09e4-S1-S2-02-S4-07"><code>S4&lt;17, T*&gt;</code></a> </td></tr>
+<td><a href="#S0-09e4-S1-S2-02-S4-07"><code>S4&lt;17, T*&gt;</code></a> </td></tr><tr>
+<td><a href="#S0-09e4-S1-S2-02-S4-02"><code>S4&lt;17, int*&gt;</code></a> </td></tr>
 </tbody>
 </table>
 
@@ -3269,6 +3269,24 @@ <h2>Derived Classes</h2>
 </tbody>
 </table>
 </div>
+</div>
+<div>
+<div>
+<h2 id="S0-09e4-S1-S2-02-S4-07"><a href="#S0-09e4-S1-S2-02-S4-07">S0&lt;15&gt;::S1::S2&lt;16&gt;::S4&lt;17, T*&gt;</a></h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;class-template-specializations-1.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">template&lt;typename T&gt;
+struct <a href="#S0-0cf-S1-S2-S4">S4</a>&lt;17, T*&gt;;
+
+</code>
+</pre>
+</div>
+
+
 </div>
 <div>
 <div>
@@ -3302,24 +3320,6 @@ <h2>Derived Classes</h2>
 </tbody>
 </table>
 </div>
-</div>
-<div>
-<div>
-<h2 id="S0-09e4-S1-S2-02-S4-07"><a href="#S0-09e4-S1-S2-02-S4-07">S0&lt;15&gt;::S1::S2&lt;16&gt;::S4&lt;17, T*&gt;</a></h2>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;class-template-specializations-1.cpp&gt;</code></div>
-<pre>
-<code class="source-code cpp">template&lt;typename T&gt;
-struct <a href="#S0-0cf-S1-S2-S4">S4</a>&lt;17, T*&gt;;
-
-</code>
-</pre>
-</div>
-
-
 </div>
 <div>
 <div>
@@ -4508,8 +4508,8 @@ <h2>Types</h2>
 <tbody>
 <tr>
 <td><a href="#S0-09e2-S5-0c-S6-S7-0b"><code>S7</code></a> </td></tr><tr>
-<td><a href="#S0-09e2-S5-0c-S6-S7-0d"><code>S7&lt;29, int*&gt;</code></a> </td></tr><tr>
-<td><a href="#S0-09e2-S5-0c-S6-S7-0a"><code>S7&lt;29, T*&gt;</code></a> </td></tr>
+<td><a href="#S0-09e2-S5-0c-S6-S7-0a"><code>S7&lt;29, T*&gt;</code></a> </td></tr><tr>
+<td><a href="#S0-09e2-S5-0c-S6-S7-0d"><code>S7&lt;29, int*&gt;</code></a> </td></tr>
 </tbody>
 </table>
 
@@ -4563,6 +4563,24 @@ <h2>Derived Classes</h2>
 </tbody>
 </table>
 </div>
+</div>
+<div>
+<div>
+<h2 id="S0-09e2-S5-0c-S6-S7-0a"><a href="#S0-09e2-S5-0c-S6-S7-0a">S0&lt;27&gt;::S5&lt;28&gt;::S6::S7&lt;29, T*&gt;</a></h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;class-template-specializations-1.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">template&lt;typename T&gt;
+struct <a href="#S0-0cf-S5-S6-S7">S7</a>&lt;29, T*&gt;;
+
+</code>
+</pre>
+</div>
+
+
 </div>
 <div>
 <div>
@@ -4596,24 +4614,6 @@ <h2>Derived Classes</h2>
 </tbody>
 </table>
 </div>
-</div>
-<div>
-<div>
-<h2 id="S0-09e2-S5-0c-S6-S7-0a"><a href="#S0-09e2-S5-0c-S6-S7-0a">S0&lt;27&gt;::S5&lt;28&gt;::S6::S7&lt;29, T*&gt;</a></h2>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;class-template-specializations-1.cpp&gt;</code></div>
-<pre>
-<code class="source-code cpp">template&lt;typename T&gt;
-struct <a href="#S0-0cf-S5-S6-S7">S7</a>&lt;29, T*&gt;;
-
-</code>
-</pre>
-</div>
-
-
 </div>
 <div>
 <div>
@@ -6031,8 +6031,8 @@ <h2>Types</h2>
 <tr>
 <td><a href="#S0-06-S5-07-S6-S7-0a-S8"><code>S8</code></a> </td></tr><tr>
 <td><a href="#S0-06-S5-07-S6-S7-0a-S9-05"><code>S9</code></a> </td></tr><tr>
-<td><a href="#S0-06-S5-07-S6-S7-0a-S9-08"><code>S9&lt;42, int*&gt;</code></a> </td></tr><tr>
-<td><a href="#S0-06-S5-07-S6-S7-0a-S9-00"><code>S9&lt;42, T*&gt;</code></a> </td></tr>
+<td><a href="#S0-06-S5-07-S6-S7-0a-S9-00"><code>S9&lt;42, T*&gt;</code></a> </td></tr><tr>
+<td><a href="#S0-06-S5-07-S6-S7-0a-S9-08"><code>S9&lt;42, int*&gt;</code></a> </td></tr>
 </tbody>
 </table>
 
@@ -6103,6 +6103,24 @@ <h2>Derived Classes</h2>
 </tbody>
 </table>
 </div>
+</div>
+<div>
+<div>
+<h2 id="S0-06-S5-07-S6-S7-0a-S9-00"><a href="#S0-06-S5-07-S6-S7-0a-S9-00">S0&lt;39&gt;::S5&lt;40&gt;::S6::S7&lt;41&gt;::S9&lt;42, T*&gt;</a></h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;class-template-specializations-1.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">template&lt;typename T&gt;
+struct <a href="#S0-0cf-S5-S6-S7-S9">S9</a>&lt;42, T*&gt;;
+
+</code>
+</pre>
+</div>
+
+
 </div>
 <div>
 <div>
@@ -6136,24 +6154,6 @@ <h2>Derived Classes</h2>
 </tbody>
 </table>
 </div>
-</div>
-<div>
-<div>
-<h2 id="S0-06-S5-07-S6-S7-0a-S9-00"><a href="#S0-06-S5-07-S6-S7-0a-S9-00">S0&lt;39&gt;::S5&lt;40&gt;::S6::S7&lt;41&gt;::S9&lt;42, T*&gt;</a></h2>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;class-template-specializations-1.cpp&gt;</code></div>
-<pre>
-<code class="source-code cpp">template&lt;typename T&gt;
-struct <a href="#S0-0cf-S5-S6-S7-S9">S9</a>&lt;42, T*&gt;;
-
-</code>
-</pre>
-</div>
-
-
 </div>
 <div>
 <div>
@@ -6853,8 +6853,8 @@ <h2>Types</h2>
 <tbody>
 <tr>
 <td><a href="#S0-07e-S1-S2-04"><code>S2</code></a> </td></tr><tr>
-<td><a href="#S0-07e-S1-S2-07"><code>S2&lt;7, int*&gt;</code></a> </td></tr><tr>
-<td><a href="#S0-07e-S1-S2-06"><code>S2&lt;7, T*&gt;</code></a> </td></tr>
+<td><a href="#S0-07e-S1-S2-06"><code>S2&lt;7, T*&gt;</code></a> </td></tr><tr>
+<td><a href="#S0-07e-S1-S2-07"><code>S2&lt;7, int*&gt;</code></a> </td></tr>
 </tbody>
 </table>
 
@@ -6908,6 +6908,24 @@ <h2>Derived Classes</h2>
 </tbody>
 </table>
 </div>
+</div>
+<div>
+<div>
+<h2 id="S0-07e-S1-S2-06"><a href="#S0-07e-S1-S2-06">S0&lt;6&gt;::S1::S2&lt;7, T*&gt;</a></h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;class-template-specializations-1.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">template&lt;typename T&gt;
+struct <a href="#S0-0cf-S1-S2">S2</a>&lt;7, T*&gt;;
+
+</code>
+</pre>
+</div>
+
+
 </div>
 <div>
 <div>
@@ -6941,24 +6959,6 @@ <h2>Derived Classes</h2>
 </tbody>
 </table>
 </div>
-</div>
-<div>
-<div>
-<h2 id="S0-07e-S1-S2-06"><a href="#S0-07e-S1-S2-06">S0&lt;6&gt;::S1::S2&lt;7, T*&gt;</a></h2>
-</div>
-<div>
-<h3>Synopsis</h3>
-<div>
-Declared in <code>&lt;class-template-specializations-1.cpp&gt;</code></div>
-<pre>
-<code class="source-code cpp">template&lt;typename T&gt;
-struct <a href="#S0-0cf-S1-S2">S2</a>&lt;7, T*&gt;;
-
-</code>
-</pre>
-</div>
-
-
 </div>
 <div>
 <div>
diff --git a/test-files/golden-tests/symbols/record/class-template-specializations-1.xml b/test-files/golden-tests/symbols/record/class-template-specializations-1.xml
index 19e1aa598..40a874dab 100644
--- a/test-files/golden-tests/symbols/record/class-template-specializations-1.xml
+++ b/test-files/golden-tests/symbols/record/class-template-specializations-1.xml
@@ -870,13 +870,6 @@
                 <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="20"/>
               </struct>
             </template>
-            <template class="explicit" id="8UtqZHVItGCqKLwlXny0WJDLkDQ=">
-              <targ class="non-type" value="17"/>
-              <targ class="type" type="int*"/>
-              <struct name="S4" id="J3UZDljdSJ1mGU9Js0JpA3TjVtc=">
-                <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="107" class="def"/>
-              </struct>
-            </template>
             <template class="partial" id="8UtqZHVItGCqKLwlXny0WJDLkDQ=">
               <tparam name="T" class="type"/>
               <targ class="non-type" value="17"/>
@@ -885,6 +878,13 @@
                 <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="102" class="def"/>
               </struct>
             </template>
+            <template class="explicit" id="8UtqZHVItGCqKLwlXny0WJDLkDQ=">
+              <targ class="non-type" value="17"/>
+              <targ class="type" type="int*"/>
+              <struct name="S4" id="J3UZDljdSJ1mGU9Js0JpA3TjVtc=">
+                <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="107" class="def"/>
+              </struct>
+            </template>
             <function name="f2" id="yEKI9aB0zN7ix7cfYpPWvZMxJnw=">
               <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="13"/>
             </function>
@@ -1106,13 +1106,6 @@
                 <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="37"/>
               </struct>
             </template>
-            <template class="explicit" id="3ZrGNdgVY0Bl8pl2wuSUdgLSht4=">
-              <targ class="non-type" value="29"/>
-              <targ class="type" type="int*"/>
-              <struct name="S7" id="3eTbiMMR3GPY7/xRty3EmJ9bdQU=">
-                <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="142" class="def"/>
-              </struct>
-            </template>
             <template class="partial" id="3ZrGNdgVY0Bl8pl2wuSUdgLSht4=">
               <tparam name="T" class="type"/>
               <targ class="non-type" value="29"/>
@@ -1121,6 +1114,13 @@
                 <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="137" class="def"/>
               </struct>
             </template>
+            <template class="explicit" id="3ZrGNdgVY0Bl8pl2wuSUdgLSht4=">
+              <targ class="non-type" value="29"/>
+              <targ class="type" type="int*"/>
+              <struct name="S7" id="3eTbiMMR3GPY7/xRty3EmJ9bdQU=">
+                <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="142" class="def"/>
+              </struct>
+            </template>
             <function name="f6" id="k6XRmHNKFO3DuTbVZ/jakKefbI4=">
               <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="35"/>
             </function>
@@ -1375,13 +1375,6 @@
                     <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="47"/>
                   </struct>
                 </template>
-                <template class="explicit" id="T91uOH7uarKVQhSHZ7iIV+AOuBQ=">
-                  <targ class="non-type" value="42"/>
-                  <targ class="type" type="int*"/>
-                  <struct name="S9" id="hwfbdkFRNunC/3V+s6HA5BwWiSQ=">
-                    <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="170" class="def"/>
-                  </struct>
-                </template>
                 <template class="partial" id="T91uOH7uarKVQhSHZ7iIV+AOuBQ=">
                   <tparam name="T" class="type"/>
                   <targ class="non-type" value="42"/>
@@ -1390,6 +1383,13 @@
                     <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="164" class="def"/>
                   </struct>
                 </template>
+                <template class="explicit" id="T91uOH7uarKVQhSHZ7iIV+AOuBQ=">
+                  <targ class="non-type" value="42"/>
+                  <targ class="type" type="int*"/>
+                  <struct name="S9" id="hwfbdkFRNunC/3V+s6HA5BwWiSQ=">
+                    <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="170" class="def"/>
+                  </struct>
+                </template>
                 <function name="f7" id="KrK+9nkR4h4eiQEFo/GgzdFR0jE=">
                   <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="40"/>
                 </function>
@@ -1523,13 +1523,6 @@
             <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="10"/>
           </struct>
         </template>
-        <template class="explicit" id="oNfOAnUjZE7WlBGdMiNtQ9ePi8g=">
-          <targ class="non-type" value="7"/>
-          <targ class="type" type="int*"/>
-          <struct name="S2" id="eWg27/kfn86dUmPA26mcOo6kkfs=">
-            <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="83" class="def"/>
-          </struct>
-        </template>
         <template class="partial" id="oNfOAnUjZE7WlBGdMiNtQ9ePi8g=">
           <tparam name="T" class="type"/>
           <targ class="non-type" value="7"/>
@@ -1538,6 +1531,13 @@
             <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="79" class="def"/>
           </struct>
         </template>
+        <template class="explicit" id="oNfOAnUjZE7WlBGdMiNtQ9ePi8g=">
+          <targ class="non-type" value="7"/>
+          <targ class="type" type="int*"/>
+          <struct name="S2" id="eWg27/kfn86dUmPA26mcOo6kkfs=">
+            <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="83" class="def"/>
+          </struct>
+        </template>
         <function name="f1" id="7KdBX5zEl2LQ4HyUjwS94i+QrTQ=">
           <file short-path="class-template-specializations-1.cpp" source-path="class-template-specializations-1.cpp" line="8"/>
         </function>
diff --git a/test-files/golden-tests/symbols/record/conditional-explicit.adoc b/test-files/golden-tests/symbols/record/conditional-explicit.adoc
index 9bbad6532..466e5abff 100644
--- a/test-files/golden-tests/symbols/record/conditional-explicit.adoc
+++ b/test-files/golden-tests/symbols/record/conditional-explicit.adoc
@@ -52,16 +52,15 @@ Constructors
 
 Declared in `&lt;conditional&hyphen;explicit&period;cpp&gt;`
 
-Conditionally explicit conversion from char
+Implicit conversion from double
 
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-explicit(sizeof(T) &gt; 4)
-link:#A-2constructor-0b[A](char value);
+link:#A-2constructor-00[A](double value);
 ----
 
-[.small]#link:#A-2constructor-0b[_» more&period;&period;&period;_]#
+[.small]#link:#A-2constructor-00[_» more&period;&period;&period;_]#
 
 Explicit conversion from int
 
@@ -74,15 +73,16 @@ link:#A-2constructor-01[A](int value);
 
 [.small]#link:#A-2constructor-01[_» more&period;&period;&period;_]#
 
-Implicit conversion from double
+Conditionally explicit conversion from char
 
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-link:#A-2constructor-00[A](double value);
+explicit(sizeof(T) &gt; 4)
+link:#A-2constructor-0b[A](char value);
 ----
 
-[.small]#link:#A-2constructor-00[_» more&period;&period;&period;_]#
+[.small]#link:#A-2constructor-0b[_» more&period;&period;&period;_]#
 
 Conditionally explicit conversion from other types
 
@@ -96,10 +96,10 @@ link:#A-2constructor-02[A](U value);
 
 [.small]#link:#A-2constructor-02[_» more&period;&period;&period;_]#
 
-[#A-2constructor-0b]
+[#A-2constructor-00]
 == link:#A[A]::A
 
-Conditionally explicit conversion from char
+Implicit conversion from double
 
 === Synopsis
 
@@ -107,8 +107,7 @@ Declared in `&lt;conditional&hyphen;explicit&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-explicit(sizeof(T) &gt; 4)
-A(char value);
+A(double value);
 ----
 
 === Parameters
@@ -146,10 +145,10 @@ A(int value);
 | The value to construct from
 |===
 
-[#A-2constructor-00]
+[#A-2constructor-0b]
 == link:#A[A]::A
 
-Implicit conversion from double
+Conditionally explicit conversion from char
 
 === Synopsis
 
@@ -157,7 +156,8 @@ Declared in `&lt;conditional&hyphen;explicit&period;cpp&gt;`
 
 [source,cpp,subs="verbatim,replacements,macros,-callouts"]
 ----
-A(double value);
+explicit(sizeof(T) &gt; 4)
+A(char value);
 ----
 
 === Parameters
diff --git a/test-files/golden-tests/symbols/record/conditional-explicit.html b/test-files/golden-tests/symbols/record/conditional-explicit.html
index 776f3004e..acd444974 100644
--- a/test-files/golden-tests/symbols/record/conditional-explicit.html
+++ b/test-files/golden-tests/symbols/record/conditional-explicit.html
@@ -71,13 +71,12 @@ <h2 id="A-2constructor-0f"><a href="#A-2constructor-0f">A::A</a></h2>
 <h3>Synopses</h3>
 <div>
 Declared in <code>&lt;conditional-explicit.cpp&gt;</code></div>
-<span>Conditionally explicit conversion from char</span>
+<span>Implicit conversion from double</span>
 <pre>
-<code class="source-code cpp">explicit(sizeof(T) &gt; 4)
-<a href="#A-2constructor-0b">A</a>(char value);
+<code class="source-code cpp"><a href="#A-2constructor-00">A</a>(double value);
 
 </code>
-</pre><span class="small"><a href="#A-2constructor-0b"><em>» more...</em></a></span>
+</pre><span class="small"><a href="#A-2constructor-00"><em>» more...</em></a></span>
 
 <span>Explicit conversion from int</span>
 <pre>
@@ -87,12 +86,13 @@ <h3>Synopses</h3>
 </code>
 </pre><span class="small"><a href="#A-2constructor-01"><em>» more...</em></a></span>
 
-<span>Implicit conversion from double</span>
+<span>Conditionally explicit conversion from char</span>
 <pre>
-<code class="source-code cpp"><a href="#A-2constructor-00">A</a>(double value);
+<code class="source-code cpp">explicit(sizeof(T) &gt; 4)
+<a href="#A-2constructor-0b">A</a>(char value);
 
 </code>
-</pre><span class="small"><a href="#A-2constructor-00"><em>» more...</em></a></span>
+</pre><span class="small"><a href="#A-2constructor-0b"><em>» more...</em></a></span>
 
 <span>Conditionally explicit conversion from other types</span>
 <pre>
@@ -108,9 +108,9 @@ <h3>Synopses</h3>
 </div>
 <div>
 <div>
-<h2 id="A-2constructor-0b"><a href="#A-2constructor-0b">A::A</a></h2>
+<h2 id="A-2constructor-00"><a href="#A-2constructor-00">A::A</a></h2>
 <div>
-<span>Conditionally explicit conversion from char</span>
+<span>Implicit conversion from double</span>
 
 </div>
 </div>
@@ -119,8 +119,7 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;conditional-explicit.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp">explicit(sizeof(T) &gt; 4)
-A(char value);
+<code class="source-code cpp">A(double value);
 
 </code>
 </pre>
@@ -182,9 +181,9 @@ <h3>Parameters</h3>
 </div>
 <div>
 <div>
-<h2 id="A-2constructor-00"><a href="#A-2constructor-00">A::A</a></h2>
+<h2 id="A-2constructor-0b"><a href="#A-2constructor-0b">A::A</a></h2>
 <div>
-<span>Implicit conversion from double</span>
+<span>Conditionally explicit conversion from char</span>
 
 </div>
 </div>
@@ -193,7 +192,8 @@ <h3>Synopsis</h3>
 <div>
 Declared in <code>&lt;conditional-explicit.cpp&gt;</code></div>
 <pre>
-<code class="source-code cpp">A(double value);
+<code class="source-code cpp">explicit(sizeof(T) &gt; 4)
+A(char value);
 
 </code>
 </pre>
diff --git a/test-files/golden-tests/symbols/record/conditional-explicit.xml b/test-files/golden-tests/symbols/record/conditional-explicit.xml
index 6a6d3daf0..252e0ec09 100644
--- a/test-files/golden-tests/symbols/record/conditional-explicit.xml
+++ b/test-files/golden-tests/symbols/record/conditional-explicit.xml
@@ -6,14 +6,14 @@
     <tparam name="T" class="type"/>
     <struct name="A" id="5tUSuMtQqtYE49jBjSYSWp0DJAM=">
       <file short-path="conditional-explicit.cpp" source-path="conditional-explicit.cpp" line="1" class="def"/>
-      <function class="constructor" name="A" explicit-spec="explicit(sizeof(T) &gt; 4)" id="tu1aWR2dJXMP1qCjx0wfqGbHUrU=">
-        <file short-path="conditional-explicit.cpp" source-path="conditional-explicit.cpp" line="11"/>
+      <function class="constructor" name="A" id="AXLv33SreHARdqogAHAgfhC3lFA=">
+        <file short-path="conditional-explicit.cpp" source-path="conditional-explicit.cpp" line="4"/>
         <param name="value">
-          <type name="char"/>
+          <type name="double"/>
         </param>
         <doc>
           <brief>
-            <text>Conditionally explicit conversion from char</text>
+            <text>Implicit conversion from double</text>
           </brief>
           <param name="value">
             <text>The value to construct from</text>
@@ -34,14 +34,14 @@
           </param>
         </doc>
       </function>
-      <function class="constructor" name="A" id="AXLv33SreHARdqogAHAgfhC3lFA=">
-        <file short-path="conditional-explicit.cpp" source-path="conditional-explicit.cpp" line="4"/>
+      <function class="constructor" name="A" explicit-spec="explicit(sizeof(T) &gt; 4)" id="tu1aWR2dJXMP1qCjx0wfqGbHUrU=">
+        <file short-path="conditional-explicit.cpp" source-path="conditional-explicit.cpp" line="11"/>
         <param name="value">
-          <type name="double"/>
+          <type name="char"/>
         </param>
         <doc>
           <brief>
-            <text>Implicit conversion from double</text>
+            <text>Conditionally explicit conversion from char</text>
           </brief>
           <param name="value">
             <text>The value to construct from</text>
diff --git a/test-files/golden-tests/symbols/record/shadowing.adoc b/test-files/golden-tests/symbols/record/shadowing.adoc
new file mode 100644
index 000000000..8b20c1a98
--- /dev/null
+++ b/test-files/golden-tests/symbols/record/shadowing.adoc
@@ -0,0 +1,174 @@
+= Reference
+:mrdocs:
+
+[#index]
+== Global namespace
+
+=== Types
+
+[cols=1]
+|===
+| Name
+| link:#Base[`Base`] 
+| link:#Derived[`Derived`] 
+|===
+
+[#Base]
+== Base
+
+=== Synopsis
+
+Declared in `&lt;shadowing&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+struct Base;
+----
+
+=== Member Functions
+
+[cols=1]
+|===
+| Name
+| link:#Base-bar[`bar`] 
+| link:#Base-baz[`baz`] 
+| link:#Base-foo[`foo`] 
+|===
+
+=== Derived Classes
+
+[cols=2]
+|===
+| Name
+| Description
+| link:#Derived[`Derived`]
+| 
+|===
+
+[#Base-bar]
+== link:#Base[Base]::bar
+
+=== Synopsis
+
+Declared in `&lt;shadowing&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+void
+bar();
+----
+
+[#Base-baz]
+== link:#Base[Base]::baz
+
+=== Synopsis
+
+Declared in `&lt;shadowing&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+void
+baz();
+----
+
+[#Base-foo]
+== link:#Base[Base]::foo
+
+=== Synopsis
+
+Declared in `&lt;shadowing&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+void
+foo();
+----
+
+[#Derived]
+== Derived
+
+=== Synopsis
+
+Declared in `&lt;shadowing&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+struct Derived
+    : link:#Base[Base]
+----
+
+=== Base Classes
+
+[cols=2]
+|===
+| Name
+| Description
+| `link:#Base[Base]`
+| 
+|===
+
+=== Member Functions
+
+[cols=1]
+|===
+| Name
+| link:#Derived-foo[`foo`] 
+|===
+
+=== Protected Member Functions
+
+[cols=1]
+|===
+| Name
+| link:#Derived-bar[`bar`] 
+|===
+
+=== Private Member Functions
+
+[cols=1]
+|===
+| Name
+| link:#Derived-baz[`baz`] 
+|===
+
+[#Derived-foo]
+== link:#Derived[Derived]::foo
+
+=== Synopsis
+
+Declared in `&lt;shadowing&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+void
+foo();
+----
+
+[#Derived-bar]
+== link:#Derived[Derived]::bar
+
+=== Synopsis
+
+Declared in `&lt;shadowing&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+void
+bar();
+----
+
+[#Derived-baz]
+== link:#Derived[Derived]::baz
+
+=== Synopsis
+
+Declared in `&lt;shadowing&period;cpp&gt;`
+
+[source,cpp,subs="verbatim,replacements,macros,-callouts"]
+----
+void
+baz();
+----
+
+
+[.small]#Created with https://www.mrdocs.com[MrDocs]#
diff --git a/test-files/golden-tests/symbols/record/shadowing.cpp b/test-files/golden-tests/symbols/record/shadowing.cpp
new file mode 100644
index 000000000..9d5dde07f
--- /dev/null
+++ b/test-files/golden-tests/symbols/record/shadowing.cpp
@@ -0,0 +1,13 @@
+struct Base {
+void foo();
+void bar();
+void baz();
+};
+
+struct Derived : Base {
+    void foo();
+protected:
+    void bar();
+private:
+    void baz();
+};
diff --git a/test-files/golden-tests/symbols/record/shadowing.html b/test-files/golden-tests/symbols/record/shadowing.html
new file mode 100644
index 000000000..c9a5e9c21
--- /dev/null
+++ b/test-files/golden-tests/symbols/record/shadowing.html
@@ -0,0 +1,247 @@
+<html lang="en">
+<head>
+<title>Reference</title>
+</head>
+<body>
+<div>
+<h1>Reference</h1>
+<div>
+<div>
+<h2 id="index"><a href="#index"></a></h2>
+</div>
+<h2>Types</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#Base"><code>Base</code></a> </td></tr><tr>
+<td><a href="#Derived"><code>Derived</code></a> </td></tr>
+</tbody>
+</table>
+
+</div>
+<div>
+<div>
+<h2 id="Base"><a href="#Base">Base</a></h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;shadowing.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">struct Base;
+
+</code>
+</pre>
+</div>
+<h2>Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#Base-bar"><code>bar</code></a> </td></tr><tr>
+<td><a href="#Base-baz"><code>baz</code></a> </td></tr><tr>
+<td><a href="#Base-foo"><code>foo</code></a> </td></tr>
+</tbody>
+</table>
+
+
+
+<div>
+<h2>Derived Classes</h2>
+<table>
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr><td><a href="#Derived"><code>Derived</code></a>
+    </td><td><span></span></td></tr>
+</tbody>
+</table>
+</div>
+</div>
+<div>
+<div>
+<h2 id="Base-bar"><a href="#Base-bar">Base::bar</a></h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;shadowing.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">void
+bar();
+
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
+<h2 id="Base-baz"><a href="#Base-baz">Base::baz</a></h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;shadowing.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">void
+baz();
+
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
+<h2 id="Base-foo"><a href="#Base-foo">Base::foo</a></h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;shadowing.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">void
+foo();
+
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
+<h2 id="Derived"><a href="#Derived">Derived</a></h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;shadowing.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">struct Derived
+    : <a href="#Base">Base</a>
+
+</code>
+</pre>
+</div>
+<div>
+<h2>Base Classes</h2>
+<table>
+<thead>
+<tr>
+<th>Name</th>
+<th>Description</th>
+</tr>
+</thead>
+<tbody>
+<tr><td><code><a href="#Base">Base</a></code></td><td><span></span></td></tr>
+</tbody>
+</table>
+</div>
+<h2>Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#Derived-foo"><code>foo</code></a> </td></tr>
+</tbody>
+</table>
+
+
+<h2>Protected Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#Derived-bar"><code>bar</code></a> </td></tr>
+</tbody>
+</table>
+
+
+<h2>Private Member Functions</h2>
+<table style="table-layout: fixed; width: 100%;">
+<thead>
+<tr>
+<th>Name</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td><a href="#Derived-baz"><code>baz</code></a> </td></tr>
+</tbody>
+</table>
+
+</div>
+<div>
+<div>
+<h2 id="Derived-foo"><a href="#Derived-foo">Derived::foo</a></h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;shadowing.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">void
+foo();
+
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
+<h2 id="Derived-bar"><a href="#Derived-bar">Derived::bar</a></h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;shadowing.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">void
+bar();
+
+</code>
+</pre>
+</div>
+</div>
+<div>
+<div>
+<h2 id="Derived-baz"><a href="#Derived-baz">Derived::baz</a></h2>
+</div>
+<div>
+<h3>Synopsis</h3>
+<div>
+Declared in <code>&lt;shadowing.cpp&gt;</code></div>
+<pre>
+<code class="source-code cpp">void
+baz();
+
+</code>
+</pre>
+</div>
+</div>
+
+</div>
+<div>
+<h4>Created with <a href="https://www.mrdocs.com">MrDocs</a></h4>
+</div>
+</body>
+</html>
\ No newline at end of file
diff --git a/test-files/golden-tests/symbols/record/shadowing.xml b/test-files/golden-tests/symbols/record/shadowing.xml
new file mode 100644
index 000000000..2875b878e
--- /dev/null
+++ b/test-files/golden-tests/symbols/record/shadowing.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<mrdocs xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:noNamespaceSchemaLocation="https://github.com/cppalliance/mrdocs/raw/develop/mrdocs.rnc">
+<namespace id="//////////////////////////8=">
+  <struct name="Base" id="ZIHuevKEF1ZlGviVwUZq1CEFBRc=">
+    <file short-path="shadowing.cpp" source-path="shadowing.cpp" line="1" class="def"/>
+    <function name="bar" id="pQRlBH5oQiwNR869QNYMqXEi3w0=">
+      <file short-path="shadowing.cpp" source-path="shadowing.cpp" line="3"/>
+    </function>
+    <function name="baz" id="+qF0/C5Lnfv5EgCTbQWJD3FtxYk=">
+      <file short-path="shadowing.cpp" source-path="shadowing.cpp" line="4"/>
+    </function>
+    <function name="foo" id="pSUoXAwvwzBmhWkB1ABLnXwZdkY=">
+      <file short-path="shadowing.cpp" source-path="shadowing.cpp" line="2"/>
+    </function>
+  </struct>
+  <struct name="Derived" id="ZRKuxRLqOi22ZbIzsfAOVW5SPzo=">
+    <file short-path="shadowing.cpp" source-path="shadowing.cpp" line="7" class="def"/>
+    <base>
+      <type id="ZIHuevKEF1ZlGviVwUZq1CEFBRc=" name="Base"/>
+    </base>
+    <function name="foo" id="UA55xTh6TiWV0mtu0bxO7Tbf9oU=">
+      <file short-path="shadowing.cpp" source-path="shadowing.cpp" line="8"/>
+    </function>
+    <function name="bar" access="protected" id="IO6406p3TUNgG0HetxgTH/AOGi8=">
+      <file short-path="shadowing.cpp" source-path="shadowing.cpp" line="10"/>
+    </function>
+    <function name="baz" access="private" id="Zeyo9BlOMeaZp6DAqIMX7l35Oy4=">
+      <file short-path="shadowing.cpp" source-path="shadowing.cpp" line="12"/>
+    </function>
+  </struct>
+</namespace>
+</mrdocs>
diff --git a/test-files/golden-tests/symbols/record/shadowing.yml b/test-files/golden-tests/symbols/record/shadowing.yml
new file mode 100644
index 000000000..e331f0b8b
--- /dev/null
+++ b/test-files/golden-tests/symbols/record/shadowing.yml
@@ -0,0 +1 @@
+extract-private: true