move callback to standard include file, make general #1495