Remove more ACE dependences in defines