fixes for getting original source code for included locations
white space change
merge