MERGE: Fix Windows DEP violations (bug #885)