rrset: Removed obsoletu includes, formatting.