FIX: Forgot to remove wmake stuff in upstream merge