commented out genericfunc.h includes so code compiles at CCin2p3