Code style update
Removed unnecessary headers which are in PCH
Merge branch 'od/issue_6_cleanup' into develop