changed order of ifdefs