Remove CPP from default-extensions; add pragmas to modules as needed.