Just include c99_compat.h or util/macros.h where needed. Reviewed-by: Jose Fonseca <jfonseca@vmware.com>