Renamed *-c.h to *.h