> So, should I add #ifndef RESOLVE here also? Humph. I don't think we want to have to tweak every dl-machine.h that way. But I don't see a better plan off hand.