Makeinclude a bit more robust.