Added C++ to xml.y and includes to commun.h