Clean up some cruft in include files.