complete wrapping changed codes in #ifdef blocks