- Changed the main core of system include files to use the same "#if"