Fix header guard names; include correct header.