Change format of includes to better reflect location in source