Added includes to commun.h
Updated xml.y