Track filenames and line numbers for includes
Merge pull request #2 from nils-eilers/master

Track filenames and line numbers for includes