Remove leading underscores from #defines