Removed redundant include directives

Also 1st successful build occurred here.