Fix build problems after moving code to filterexec
Fix build problems after moving code to filterexec

cmusatyalab/opendiamond,cmusatyalab/opendiamond,cmusatyalab/opendiamond,cmusatyalab/opendiamond,cmusatyalab/opendiamond