[FOLD] Fix beast includes
[FOLD] tidy up includes