Otherwise we conflict with the officecfg includes; and it is a bad idea to
have too broad names for #define's anyway.

Change-Id: Ie48e6f109f654a9ee4aedb3eb37df5e67f88a905