s2w/dt2w: correct #ifdef's to unbreak build

Change-Id: I5acc185e12081262fd2839f594c2db2a83e97296