fixed macro inclusion