Remove a couple unnecessary HAVE_*_H header defines