Remove blanket includes and insteand include what is actually used
Merge pull request #312 from bastih/master

Remove blanket includes and instead include what is actually used