Morning fixes with a rebooted mind
A small changes of includes
Merge branch 'master' of https://github.com/cupsnwires/P2P_messenger