Remove another ifdef from the headers.