diff --git a/core/cont/inc/TList.h b/core/cont/inc/TList.h
index a86af707c175c..267a3a7acb58b 100644
--- a/core/cont/inc/TList.h
+++ b/core/cont/inc/TList.h
@@ -38,9 +38,9 @@ class TListIter;
 class TList : public TSeqCollection {
 
 friend  class TListIter;
-
-protected:
+public:
    using TObjLinkPtr_t = std::shared_ptr<TObjLink>;
+protected:
    using TObjLinkWeakPtr_t = std::weak_ptr<TObjLink>;
 
    TObjLinkPtr_t     fFirst;     //! pointer to first entry in linked list
@@ -121,9 +121,9 @@ friend  class TListIter;
 class TObjLink : public std::enable_shared_from_this<TObjLink> {
 
 friend class TList;
-
-private:
+public:
    using TObjLinkPtr_t = std::shared_ptr<TObjLink>;
+private:
    using TObjLinkWeakPtr_t = std::weak_ptr<TObjLink>;
 
    TObjLinkPtr_t     fNext;
diff --git a/core/meta/inc/TFileMergeInfo.h b/core/meta/inc/TFileMergeInfo.h
index 5404fc8d1b6d0..447dc3a571305 100644
--- a/core/meta/inc/TFileMergeInfo.h
+++ b/core/meta/inc/TFileMergeInfo.h
@@ -39,9 +39,9 @@ class TIOFeatures;
 }
 
 class TFileMergeInfo {
-private:
+public:
    using TIOFeatures = ROOT::TIOFeatures;
-
+private:
    TFileMergeInfo() = delete;
    TFileMergeInfo(const TFileMergeInfo&) = delete;
    TFileMergeInfo& operator=(const TFileMergeInfo&) = delete;
diff --git a/core/rint/test/TTabComTests.cxx b/core/rint/test/TTabComTests.cxx
index 2557cfb316665..d33235ab46d33 100644
--- a/core/rint/test/TTabComTests.cxx
+++ b/core/rint/test/TTabComTests.cxx
@@ -95,8 +95,8 @@ TEST(TTabComTests, CompleteTProfile)
 
 TEST(TTabComTests, CompleteTObj)
 {
-   std::string expected = "TObjArray TObjArrayIter TObjLink TObjOptLink TObjString"
-      " TObject TObjectRefSpy TObjectSpy TObjectTable";
+   std::string expected = "TObjArray TObjArrayIter TObjLink TObjLinkPtr_t TObjOptLink"
+      " TObjString TObject TObjectRefSpy TObjectSpy TObjectTable";
    // FIXME: See ROOT-10989
    ASSERT_STREQ(expected.c_str(), GetCompletions("TObj",
                                                  /*ignore=*/{"TObjectDisplayItem", "TObjectDrawable", "TObjectHolder",
diff --git a/geom/geom/inc/TGeoTessellated.h b/geom/geom/inc/TGeoTessellated.h
index 062b613d1c2f9..be7cb08b08f5d 100644
--- a/geom/geom/inc/TGeoTessellated.h
+++ b/geom/geom/inc/TGeoTessellated.h
@@ -18,6 +18,7 @@
 #include "TGeoBBox.h"
 
 class TGeoFacet {
+public:
    using Vertex_t = Tessellated::Vertex_t;
    using VertexVec_t = Tessellated::VertexVec_t;
 
diff --git a/tree/tree/inc/TBranch.h b/tree/tree/inc/TBranch.h
index a74cd85c01d15..e88a6cf596e1a 100644
--- a/tree/tree/inc/TBranch.h
+++ b/tree/tree/inc/TBranch.h
@@ -91,6 +91,7 @@ class TBulkBranchRead {
 }
 
 class TBranch : public TNamed, public TAttFill {
+public:
    using TIOFeatures = ROOT::TIOFeatures;
 
 protected:
diff --git a/tree/tree/inc/TLeaf.h b/tree/tree/inc/TLeaf.h
index bdfa83038cb39..00692d43a8a46 100644
--- a/tree/tree/inc/TLeaf.h
+++ b/tree/tree/inc/TLeaf.h
@@ -60,9 +60,12 @@ class TLeaf : public TNamed {
 
    virtual Int_t GetOffsetHeaderSize() const {return 0;}
 
-protected:
+public:
 
    using Counts_t = std::vector<Int_t>;
+
+protected:
+
    struct LeafCountValues {
       Counts_t fValues;
       Long64_t fStartEntry{-1}; ///<! entry number of corresponding to element 0 of the vector.