Add missing dependency, tidy up package headers