headers: Sync up some header guard changes from drm-next.