Remove unused header includes from public header.

Change-Id: Ie9d42f15e2881f1f4bb78147d0250a174d9542c1