Cleaning up #includes for cross-platform compilation