fix some dune 2.3 deprecation warnings

also use the actual grid headers for grids, not the corresponding DGF
parser header.