As mentioned repeatedly in #6134, the PR request has introduced an unnecessary circular dependency:
Befere CTxMemPool depended on CBlockPolicyEstimator, but CBlockPolicyEstimator didn’t depend on CTxMemPool until #6134 was merged. The first commit would have been practically free diff-wise if it had been squashed in #6134. The second are additional simplifications that wouldn’t have been free, but include here for discussion.