ifdef: fix some include ifdefs