move snarfer to use X includes
2 files changed