At the end of chapter 696 Luffy said he was going to take down all the Yonko.
Ibelieve that it was just a general statement.
Here are some reasons why it should not have included Shanks.
1) Luffy remembers their promise about the Straw Hat.
2) Luffy wouldn't have DF powers if it wasn't for Shanks.
3) Shanks saved luffy's life and gave up an arm in the process.
So because of the above Luffy did not mean Shanks too.
What do you think?