Added full path declarations in includes in classes