Update defconfig, add some missing includes