remove some more strange HAVE_ #ifdefs