Merged changes from Mezzanine to remove useless forward declaration and a few warnings