9ab6f89604
Mostly in record and device support, this commit puts the include in the right place and moves some other includes around to get the order right.