hwcomposer patch, removed unused header files