Fix Solid includes