fix gcc build (not so const shared ptrs)
fix includes