[dbus] cleanup, include xml