Fixing headers only!
Fixed all the warnings. Build is successful.