Windows compilation merge