CRA-523
Undo changes in Makeheader from previous commit, and remove two trailing blanks in crava.cpp