Cleanups and fixes for the communication layer

Remove no longer used code and add include guards. Details are in the commit messages.

Signed-off-by: Stefan Schmidt stefan.schmidt@huawei.com