Remove includes from protocol.h that weren't used there and deal with the fallout

Testing Done:
Compiled and ran locally. Connected with bonjour, xmpp, and irc.

Reviewed at https://reviews.imfreedom.org/r/635/