encapsulate all changes into ifdefs