Updated Configuration and pheader

added include guards