Re #5627. A few places that include LoadRaw.h unnecessarily.