fix lousy macro declarations