Xml fix

There seem to be some tags in the connman-session.xml that are not properly close. This makes the generator generate incomplete files.

To prepare for better generation I also cleaned up some of the includes.