Update defconfig, add in some missing includes