fixes to chapter 9 vis-a-vis include structure