remove redundant include & internal includes