Remove some unused AC_DEFINE's, and also remove a redundant AC_DEFINE