Additional header files required by the previous patch.  Additionally the referenced to u.out.h in uobj.c should be changed to use xc/u.out.h.