rearrange #defines