Updated symbols definitions, so that we don't redefine macros (and have the subsequent warnings/errors).
Authored by: rconstruct 2008-10-26
Parent: [r85]
Child: [r87]
