Conflicts:
	class.xfiledef.inc
	class.xlogs.inc
	class.xsession.inc
	system.inc