fix: include packages unless it is not needed (#6765)

fix: include packages unless it is not needed (#6765) #530