Revert "Remove redundant includes and refactor"

Authored by shubham on Jun 12 2019, 4:41 PM.