Remove unneeded defines and use 'include.xml'