[1] Fixed ARC compiler issue
[2] Fixed include comiper issue