Fixes to new include code. For #37