Cleaned up more header inclusion.