Fixed include path dependencies
Merge branch 'hyamamoto' into dev