MB-7629 Fix indentation and remove unused includes

Change-Id: Ib87f1a849c24ee3f848a2660d1e20d5e73f0d0fc
Reviewed-on: http://review.couchbase.org/25618
Reviewed-by: Fulu Li <fulu@couchbase.com>
Tested-by: Filipe David Borba Manana <fdmanana@gmail.com>