fix includes; speed up writes to /dev/null