Fixed unnecessary .h includes in headerfiles, added forward decleration.
Added .h includes in cpp files