Fixed #includ xxx

I fixed ALL the #includes so now everything is compiling
Merge pull request #68 from MarcelBock/master

Fixed all  #include xxx