Do not always add -Iincludes to C arguments (#610)