add missing header for ondemandplus
and more changes for governors.
fix build error