#include some missing #includes