Removed unneeded includes. Refactores std forward declarations