Fix include file location
Merge branch 'develop'