Fixing #ifdef-s