missing includes (causes compilation to fail).
rebased onto fd87b3e8d3c9f45448f93b22eb7e12781f58f57f
Pull-Request has been merged by rcritten
missing includes (causes compilation to fail).