Added directory includes.
Fixed warnings.
Merge pull request #4 from BlockoS/master

Added directory includes.