Fix build - headers/warnings

Signed-off-by: Jon Ludlam <jonathan.ludlam@eu.citrix.com>