Remove unused #includes

Signed-off-by: Tim Jarratt <tjarratt@pivotallabs.com>