Hack bugfix for multiline off-by-one (locfile.c)
locfile.h -> locfile.h + locfile.c

clean up includes of a few files
Bugfix multiline off-by-one (locfile.c)