Tweaks to CMakeLists.txt, and premature EOF in file.h