use correct ifndef instead of #if 0, fix some whitespace changes coming from...

use correct ifndef instead of #if 0, fix some whitespace changes coming from merging/stripping, fix a merge error