reordering includes and adapted the interface calls for accessing attributes of a raster