Fix various missing includes