Changed ifdef in headers