fix includes and use uniform_generator_layers