Improved error messages for malformed includes, and ignored \r.