libwbclient: Fix s4 build failure by fixing up includes.