Added macro undefinitions