move other includes for c++0x compatibility