Add missing guards around config.h inclusion

In some cases the header may not exist, leading to compilation issues.
Add the ifdef HAVE_CONFIG_H, as it is those in other parts of the

[Emil Velikov: Split out from a larger commit, rework commit message]
Signed-off-by: Emil Velikov <>
Reviewed-by: Alan Coopersmith <>
Signed-off-by: Alan Coopersmith <>
3 files changed