Added handling for multiple defines of the same variable name