* Regression introduced in dbeabe61 * Removed unrequired includes * Aligned other variables and structures to ensure feature parity
dbeabe61