Revert "Cleanup headers"

This reverts commit 4577a69ba290dc9ddc3b38906acc94af42a6ca75.