Should be done via platform-independent headers
Should be done via platform-independent headers