Determining what's included when calculating the heat emitted (q).

When calculating the amount of heat emitted (q):

In which of these situations should you add the weight of what is added to the water, to the weight of the water itself?

-17g stick of boiled metal added to water in a calorimeter.

or

-2g of NaOH added to water to measure the heat of dissolving.