Move includes into toys.h, more xprintf()
2 files changed