Add CSV Reader module to Makefile and fix some build errors.