Add missing headers
Address PR comments