Fix Include dir error
Merge branch 'include_fix'