Merge change 5302 into donut

* changes:
  Add includes to enable host C++ tools to compile with GCC 4.4