Update include files to compile cm9