Redundant flexibility in bumptilemap is redundant. Removed it. The header files are a big mess now, though, so tryto clean it up later with the no includes in header files rule, or by splitting them up more, perhaps between typedefs and unction declarations.