kill off a few kernel headers that refused to die!

Change-Id: I11c75a8f8a83586dc7e15ba3221613be7bd0934f