Added includes to roc and rocplot macros