[FOLD] Replace ref, cref
[FOLD] Add missing beast includes
Tidy up includes