fix for issue 3858 (remove unneeded #include's)

also use correct include path on Linux
Merge pull request #3202 from parafin:bug_3858-2.4