Move couple of ifdefs after "include config.mk"