I forgot there was a reason why the inclusions and definition of u_int

was made in a certain sequence.  This change restores the earlier
"chain of command".