improve includes in headers and handling of namspace std
Merge pull request #3 from timflutre/master

improve includes of headers