Removed non existing includes / classes by pullrequest #102 related and fixes #99