added missing include directives and namespace qualifiers.
Merge pull request #1 from yomichi/master

added missing include directives and namespace qualifiers.