Removed unused header files

Change-Id: Ib6666dc7d360ae23c6444bac82e057f8e1b786e9