Initial work on processing Includes.xml