Reenabled SET and DEFINE inside definitions
Modified make file to properly account for changes