Added ifs and include and define.