It would be good to decide whether we should keep the numerous #ifdef INETs in our code. I've seen many files that inconsistently use #ifdef INET; one place has them, another doesn't, and so on.