Add missing headers and formatting only.