Added all library paths to the include dirs; Changed back the modifed include paths from various lib files.
Merge branch 'fix_include_paths' into dev