Simon> comp-unit.h is only about the header (struct comp_unit_head), so it could Simon> be renamed comp-unit-head.h. At first I balked because there's also a .c, but I guess I can rename them both. Tom