Remove a pair of unnecessary dependencies on datapath-protocol.h.