Merge pull request #1029 from islmit01/im/fix_includes