Code clean up to reduce redundant includes
Changes for rebranding of big skin logo file