remove bitset includes
textured shapes and tiles, warning fixes