Re-opening this one, as the shortened header requires the include statements in the spec AsciiDoc files to be adjusted accordingly.