Adding a couple of missing includes