fix *.h errors, some output.c