Fixed #include problems on Linux.
Bumped RI version.