Now these files are in the base roll

Signed-off-by: Luca Clementi <luca.clementi@gmail.com>