Reorganized to ensure platform-dependent building