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

also use correct include path on Linux