Added some more includes

As includes are not added to the build, maybe this isn't the best place
for them