fix non-DEBUG_THREADS builds with new cond wrappers and lock header reorganization