diff --git a/src/avalanche/compactproofs.h b/src/avalanche/compactproofs.h
--- a/src/avalanche/compactproofs.h
+++ b/src/avalanche/compactproofs.h
@@ -5,7 +5,7 @@
 #ifndef BITCOIN_AVALANCHE_COMPACTPROOFS_H
 #define BITCOIN_AVALANCHE_COMPACTPROOFS_H
 
-#include <avalanche/peermanager.h>
+#include <avalanche/prooftreeelement.h>
 
 #include <random.h>
 #include <serialize.h>
@@ -35,7 +35,7 @@
     CompactProofs()
         : shortproofidk0(GetRand(std::numeric_limits<uint64_t>::max())),
           shortproofidk1(GetRand(std::numeric_limits<uint64_t>::max())) {}
-    CompactProofs(const RadixTree<PeerManager::ProofElement> &proofs);
+    CompactProofs(const RadixTree<ProofTreeElement> &proofs);
 
     uint64_t getShortID(const ProofId &proofid) const;
 
diff --git a/src/avalanche/compactproofs.cpp b/src/avalanche/compactproofs.cpp
--- a/src/avalanche/compactproofs.cpp
+++ b/src/avalanche/compactproofs.cpp
@@ -10,7 +10,7 @@
 
 namespace avalanche {
 
-CompactProofs::CompactProofs(const RadixTree<PeerManager::ProofElement> &proofs)
+CompactProofs::CompactProofs(const RadixTree<ProofTreeElement> &proofs)
     : CompactProofs() {
     proofs.forEachLeaf([&](auto pLeaf) {
         shortproofids.push_back(getShortID(pLeaf->proof->getId()));
diff --git a/src/avalanche/peermanager.h b/src/avalanche/peermanager.h
--- a/src/avalanche/peermanager.h
+++ b/src/avalanche/peermanager.h
@@ -8,6 +8,7 @@
 #include <avalanche/node.h>
 #include <avalanche/proof.h>
 #include <avalanche/proofpool.h>
+#include <avalanche/prooftreeelement.h>
 #include <coins.h>
 #include <consensus/validation.h>
 #include <pubkey.h>
@@ -157,19 +158,8 @@
     ProofPool conflictingProofPool;
     ProofPool orphanProofPool;
 
-public:
-    struct ProofElement {
-        ProofRef proof;
-
-        ProofElement(const ProofRef &proofIn) : proof(proofIn) {}
-
-        Uint256KeyWrapper getId() const { return proof->getId(); }
-
-        IMPLEMENT_RCU_REFCOUNT(uint64_t);
-    };
-
 private:
-    RadixTree<ProofElement> shareableProofs;
+    RadixTree<ProofTreeElement> shareableProofs;
 
     using NodeSet = boost::multi_index_container<
         Node,
@@ -372,7 +362,7 @@
     bool isOrphan(const ProofId &proofid) const;
     bool isInConflictingPool(const ProofId &proofid) const;
 
-    RadixTree<ProofElement> getShareableProofsSnapshot() const {
+    RadixTree<ProofTreeElement> getShareableProofsSnapshot() const {
         return shareableProofs;
     }
 
diff --git a/src/avalanche/peermanager.cpp b/src/avalanche/peermanager.cpp
--- a/src/avalanche/peermanager.cpp
+++ b/src/avalanche/peermanager.cpp
@@ -314,7 +314,7 @@
     assert(inserted.second);
 
     auto insertedRadixTree =
-        shareableProofs.insert(RCUPtr<ProofElement>::make(proof));
+        shareableProofs.insert(RCUPtr<ProofTreeElement>::make(proof));
     assert(insertedRadixTree);
     RCULock::synchronize();
 
@@ -694,7 +694,7 @@
 
     // Check there is no dangling proof in the radix tree
     bool danglingProofInRadixTree = false;
-    shareableProofs.forEachLeaf([&](RCUPtr<ProofElement> pLeaf) {
+    shareableProofs.forEachLeaf([&](RCUPtr<ProofTreeElement> pLeaf) {
         if (!isBoundToPeer(pLeaf->proof->getId())) {
             danglingProofInRadixTree = true;
         }
diff --git a/src/avalanche/prooftreeelement.h b/src/avalanche/prooftreeelement.h
new file mode 100644
--- /dev/null
+++ b/src/avalanche/prooftreeelement.h
@@ -0,0 +1,28 @@
+// Copyright (c) 2022 The Bitcoin developers
+// Distributed under the MIT software license, see the accompanying
+// file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+#ifndef BITCOIN_AVALANCHE_PROOFTREEELEMENT_H
+#define BITCOIN_AVALANCHE_PROOFTREEELEMENT_H
+
+#include <avalanche/proof.h>
+#include <radix.h>
+#include <rcu.h>
+
+#include <cstdint>
+
+namespace avalanche {
+
+struct ProofTreeElement {
+    ProofRef proof;
+
+    ProofTreeElement(const ProofRef &proofIn) : proof(proofIn) {}
+
+    Uint256KeyWrapper getId() const { return proof->getId(); }
+
+    IMPLEMENT_RCU_REFCOUNT(uint64_t);
+};
+
+} // namespace avalanche
+
+#endif // BITCOIN_AVALANCHE_PROOFTREEELEMENT_H
diff --git a/src/avalanche/test/compactproofs_tests.cpp b/src/avalanche/test/compactproofs_tests.cpp
--- a/src/avalanche/test/compactproofs_tests.cpp
+++ b/src/avalanche/test/compactproofs_tests.cpp
@@ -45,11 +45,10 @@
     {
         const size_t N = 1000;
 
-        RadixTree<avalanche::PeerManager::ProofElement> proofs;
+        RadixTree<avalanche::ProofTreeElement> proofs;
         for (size_t i = 0; i < N; i++) {
-            BOOST_CHECK(proofs.insert(
-                RCUPtr<avalanche::PeerManager::ProofElement>::make(
-                    buildRandomProof(MIN_VALID_PROOF_SCORE))));
+            BOOST_CHECK(proofs.insert(RCUPtr<avalanche::ProofTreeElement>::make(
+                buildRandomProof(MIN_VALID_PROOF_SCORE))));
         }
 
         CompactProofs cpw(proofs);