Fixes for Issues #1 and #2

This pull request contains fixes for issues #1 and #2:

#1: Conflicting include directives.
#2: Lack of dependencies listing.