Merge "Remove unused #includes" into tizen