Sync to 12984
Remove some unused irr_driver includes
Likewise for userconfigparams