Better solution for avoiding "define" collision