Update documentation and formatting for includes/deferred/