Remove some header dependencies from AdvancedHeurCalculator
Remove some header dependencies from BlocklistGenerator
Move class from hpp to cpp