Fix more build breaks with boost-1.48
Add missing include; fixes build break
More fixes for build breaks.

This stuff fails to build on boost 1.48, due to bad include-file ordering.
Fix more include-file fruitiness.