Few more build fixes, and use correct diff format for wifi_data_provider_freebsd.*