Fixup wifi & remove camera header causing build error