Remove net.h unity header, add missing includes