Added "--xincludestyle" support