Just fix some compile issue on Mac and cppunit include issue