Fixed a couple of missing defs
Merge pull request #805 from worktycho/undef

Fixed a couple of missing defs