fixes a ressource leak

Change-Id: I7a27be09e377c2c6306e768dbaf8e8239da2c86e
moving includes

Change-Id: I2101d84a74a7f2b5dd06c546b9618e537b39ed36