Made .i files imports match C header imports.