Fix warnings
Fix another regression.
Tidy up beast project files
Tidy up includes and header material