Fix error due to missing includes.

While I'm pushing cleanup changes, this also fixes a few warnings
related to extraneous semicolons.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@320720 91177308-0d34-0410-b5e6-96231b3b80d8
2 files changed