Ever since I last updated, I've started to get errors about includes missing, so I've added them. (cherry picked from commit 73d090f7)