Split the server message bus implementation into its own object - you should be able to use D-Bus without it#364