Update Advanced definitions with 2012 changes from Callerlab
Fix dependency of xml definition files in each directory