Locate ids only in input file and not in included header files
Merge remote-tracking branch 'origin/master'