[FOLD] Reduce includes
[FOLD] gcc fixes