Removing two .h files means we need to update cleancount to force