Minor cleanup, header inclusion moved.