include wrapper rather than cmpsc311 in macro.c