Add back in some #includes that were removed incorrectly by the

previous check-in.

FossilOrigin-Name: 718905367ff3f86a449c2c27f724089ba31dea3a