Fix #includes after my last commit.