fix ifdef && buddies