Avoid recursive header-expansion.

  This closes #196