Remove commented-out includes
Fix compilation problem with VC++.