Remove some header dependencies from BlocklistGenerator