does prepayment risk also include reinvestment risk?

If a security has prepayment risk, does it also mean that it has reinvestment risk?

Yes, because if you receive a payment earlier than the specified date, then you run a risk of not being able to invest this amount at the rate you wish to (if the market interest rate declines in that time).