Add missing conditional compilation guards (SK_O_TAIL)