Forgot to include header file modifications in
commit 777625246e16b466398cd212adc07dd80bef0cbe.