Replaced commented-out line with ifndef block.  Corrected compile errors for targets other than MASTER_PIC.