Tidied up config.h.in to remove redundant guard - take two