Added DEFINES for XE5, fixed minor bug in XE4 section