Fix include guard issue created by issue 1