Headers: update & clean-up unused in 4.2

Change-Id: Ifd62556b97aa7310352c9d97319ed6513d7a4513