Define both highbit and highbit64 until we are updated to 20140805