Makefiles changed after intel 14 fixes.

This is due to "use module" reorderings.