Common: remove duplicate defines
Merge branch 'master' into satradix