Make sure we have all the needed includes and declarations.
Merge branch '20130421-ip-provider' into 20130427-udp-provider
Merge branch '20130427-udp-provider' into 20130428-tcp-provider