Remove the second hack for .c.txt files.
Remove g++ compilation warning.