Updated headers in System C