[boost] Timer & Boost.Test incompatibility

Hi, I am starting a new project. I am using boost::timer::cpu_timer from boost/timer/timer.hpp and Boost.Test When I include boost/test/included/unit_test.hpp in my unit test suite, I get compilation errors where boost::timer is declared as a class where previously it's defined as a namespace: boost/timer.hpp(45): error C2869: 'boost::timer' : has already been defined to be a namespace boost/test/impl/framework.ipp(153): error C2882: 'timer' : illegal use of namespace identifier in expression boost/test/impl/framework.ipp(153): fatal error C1903: unable to recover from previous error(s); stopping compilation Environment: Boost 1.51.0 MSVC 2012 Windows 7 Is this a known conflict? Is there any workaround? Thanks -- Craig