line number alignment; better regex for #includes; disallow reincluding files by default