add ChangeLog entry: add more guards around definition of ACE_-related code