Update formatting on includes/deferred/