More fixes are required to allow ospf/protocol and ospf/ctl to build. Change-Id: I6367178a5dff56f13e4c67c4503bc59b7deb45cb