Clean up header dependencies for Dumper