fixup more includes