More fixes to the include file.