fixes to makefiles such that it compiles with icc (v13)