More renaming of include files so it will work in both c and c++ modes