ifdef guard changes for LSD001/0.12