Merge "Add in_port_t and move it and in_addr_t to the correct header file."