This fixes a missing symbol and another minor header issue.  Needed to
build for wr-switch.
Signed-off-by: Alessandro Rubini <rubini@gnudd.com>