Maintain correct ordering even with platform-specific files