Add a bunch of headers and remove wifi to get to build