(1) #include <libvirt/*.h> ---> #include "libvirt/*.h" (2) src/internal.h has become a dumping ground for all sorts of includes. Removed the ones which are not actually used in this file (ie. almost all of them) and moved them down into the two files which actually needed them. (3) Remove <ansidecl.h>, which is apparently some legacy thing. (4) Add a comment that __func__ is from the C99 standard. (5) xen_unified.c was defining a symbol called 'VERSION' which clashed with the one from "config.h", so change it to HV_VERSION. (6) <limits.h> / <sys/syslimits.h> / backup plan if neither exists -- is done in src/internal.h, so remove explicit includes from other files. Rich. -- Emerging Technologies, Red Hat - http://et.redhat.com/~rjones/ Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SL4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 03798903