As I was watching, I couldn't recall if all that is in the movie is included in Tolkien's original novel. Do you know? I mean, are they making these movies in an attempt to include everything in the book?
Basically, the movies (all three parts) include what's in the book, but there are scenes that they shot that's not in the book and are new. For example, in the Desolation of Smaug, Evangeline Lilly's character, Tauriel, is an original character, not in the books. There's also a 'connection' with her and Kili, which is obviously not in the book So, stuff like that they added into the movies. I hope that answered your question!