Recycle existing #defines

Change-Id: I301b4bc38e4eafd15ad13a1631346ca80757f3f6