gcc3's cpp warns about missing defines in imakefiles, two obvious fixes. Start removing warnings caused by extra shit at end of #undef...